diff --git a/config/companion_tools.in b/config/companion_tools.in
index c311b580..ea6724f5 100644
--- a/config/companion_tools.in
+++ b/config/companion_tools.in
@@ -2,7 +2,15 @@
 
 menu "Companion tools"
 
+config COMP_TOOLS_make_3_81_NEEDED
+    bool
+    depends on ! CONFIGURE_has_make381
+    default y
+    select COMP_TOOLS
+    select COMP_TOOLS_make
+
 comment "READ HELP before you say 'Y' below !!!"
+
 config COMP_TOOLS
     bool
     prompt "Build some companion tools"
diff --git a/configure.ac b/configure.ac
index a8a615b8..ce26b1c8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -220,6 +220,20 @@ AC_CACHE_CHECK([for GNU make >= 3.80], [ac_cv_path_MAKE],
 AC_SUBST([MAKE], [$ac_cv_path_MAKE])
 AC_PROG_MAKE_SET
 
+# Check for GNU make 3.81 exactly, otherwise
+# it will be built as a companion tool.
+AC_MSG_CHECKING([for make 3.81])
+AS_IF(
+      [test "$MAKE_ver" = "GNU Make 3.81"],
+      [make381="y"
+       AC_MSG_RESULT([yes])
+      ],
+      [make381=
+       AC_MSG_RESULT([no])
+      ]
+     )
+ACX_SET_KCONFIG_OPTION([make381])
+
 #----------------------------------------
 # Check for libtool >= 1.5.26
 AC_CACHE_VAL([ac_cv_path_LIBTOOL],