diff --git a/Makefile b/Makefile
index 1733d670f988..400f2e5af52b 100644
--- a/Makefile
+++ b/Makefile
@@ -148,6 +148,11 @@ upgrade_checks:
 		if ! make -m ${.CURDIR}/share/mk test > /dev/null 2>&1; then \
 			make make; \
 		fi
+	@cd ${.CURDIR}; \
+		if make -V .CURDIR:C/.// 2>&1 >/dev/null | \
+		    grep -q "Unknown modifier 'C'"; then \
+			make make; \
+		fi
 
 #
 # A simple test target used as part of the test to see if make supports