diff --git a/include/prereq-build.mk b/include/prereq-build.mk
index afb92ff02..84d3f2274 100644
--- a/include/prereq-build.mk
+++ b/include/prereq-build.mk
@@ -18,13 +18,6 @@ $(eval $(call Require,non-root, \
 	Please do not compile as root. \
 ))
 
-define Require/umask-0022
-	[ "$$(shell umask)" -eq 22 ]
-endef
-$(eval $(call Require,umask-0022, \
-	Please compile with umask 0022. \
-))
-
 # Required for the toolchain
 define Require/working-make
 	$(MAKE) -v | awk '($$$$1 == "GNU") && ($$$$2 = "Make") && ($$$$3 >= "3.81") { print "ok" }' | grep ok > /dev/null
diff --git a/include/toplevel.mk b/include/toplevel.mk
index dee43cba9..cb50dfa3d 100644
--- a/include/toplevel.mk
+++ b/include/toplevel.mk
@@ -41,6 +41,8 @@ endif
 SCAN_COOKIE?=$(shell echo $$$$)
 export SCAN_COOKIE
 
+SUBMAKE:=umask 022; $(SUBMAKE)
+
 prepare-mk: FORCE ;
 
 prepare-tmpinfo: FORCE