diff --git a/package/make/Config.in b/package/make/Config.in
index aea72e31f4..f576b7b5a3 100644
--- a/package/make/Config.in
+++ b/package/make/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_MAKE
 	bool "make"
+	depends on BR2_USE_MMU # fork()
 	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
 	help
 	  A tool which controls the generation of executables and other
diff --git a/package/make/make.mk b/package/make/make.mk
index 74726e21e9..803595f026 100644
--- a/package/make/make.mk
+++ b/package/make/make.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-MAKE_VERSION = 3.82
+MAKE_VERSION = 4.0
 MAKE_SOURCE = make-$(MAKE_VERSION).tar.bz2
 MAKE_SITE = $(BR2_GNU_MIRROR)/make
 MAKE_LICENSE = GPLv3+
@@ -12,8 +12,4 @@ MAKE_LICENSE_FILES = COPYING
 
 MAKE_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)
 
-MAKE_CONF_ENV = make_cv_sys_gnu_glob=no \
-		GLOBINC='-I$(@D)/glob' \
-		GLOBLIB=glob/libglob.a
-
 $(eval $(autotools-package))
diff --git a/package/uclibc/Config.in b/package/uclibc/Config.in
index cda6e0bd31..0838b6cb82 100644
--- a/package/uclibc/Config.in
+++ b/package/uclibc/Config.in
@@ -157,6 +157,7 @@ config BR2_UCLIBC_INSTALL_UTILS
 config BR2_UCLIBC_INSTALL_TEST_SUITE
 	bool "Compile and install uClibc tests"
 	select BR2_PACKAGE_MAKE
+	depends on BR2_USE_MMU # make
 	help
 	  Enabling this option will compile and install the uClibc test suite.
 	  This is useful if you want to check if the uClibc library is working