diff --git a/Makefile b/Makefile
index 470aa837ce..811158295a 100644
--- a/Makefile
+++ b/Makefile
@@ -811,13 +811,12 @@ check-dependencies:
 
 else # ifeq ($(BR2_HAVE_DOT_CONFIG),y)
 
-all: menuconfig
-
 # Some subdirectories are also package names. To avoid that "make linux"
 # on an unconfigured tree produces "Nothing to be done", add an explicit
 # rule for it.
+# Also for 'all' we error out and ask the user to configure first.
 .PHONY: linux toolchain
-linux toolchain:
+linux toolchain all:
 	$(error Please configure Buildroot first (e.g. "make menuconfig"))
 	@exit 1