diff -r 9321d9d7af9b -r e11a8a2e225d config/companion_tools.in
--- a/config/companion_tools.in	Thu Feb 20 18:23:08 2014 +0000
+++ b/config/companion_tools.in	Tue Mar 11 22:11:43 2014 +0100
@@ -2,10 +2,14 @@
 
 menu "Companion tools"
 
+# Tools that require make-3.81 to build should select this:
 config COMP_TOOLS_make_3_81_NEEDED
     bool
+
+config COMP_TOOLS_FORCE_make_3_81
+    def_bool y
+    depends on COMP_TOOLS_make_3_81_NEEDED
     depends on ! CONFIGURE_has_make381
-    default y
     select COMP_TOOLS
     select COMP_TOOLS_make