diff --git a/Makefile b/Makefile
index 5ff68a8421f1..b3015c527ef5 100644
--- a/Makefile
+++ b/Makefile
@@ -209,6 +209,12 @@ cleanworld:
 # Handle the user-driven targets, using the source relative mk files.
 #
 
+.if empty(.MAKEFLAGS:M-n)
+# skip this for -n to avoid changing previous behavior of 
+# 'make -n buildworld' etc.
+${TGTS}: .MAKE
+.endif
+
 ${TGTS}:
 	${_+_}@cd ${.CURDIR}; ${_MAKE} ${.TARGET}
 
diff --git a/Makefile.inc1 b/Makefile.inc1
index 78f98e82e00e..2b49ab808559 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1890,3 +1890,5 @@ _xi-links:
 xdev xdev-build xdev-install:
 	@echo "*** Error: Both XDEV and XDEV_ARCH must be defined for \"${.TARGET}\" target"
 .endif
+
+buildkernel ${WMAKE_TGTS} ${.ALLTARGETS:M_*}: .MAKE