2 files changed, 5 insertions, 2 deletions
diff --git a/Config.in b/Config.in
index 6c9e0c5de..33f6d9aee 100644
--- a/Config.in
+++ b/Config.in
@@ -9,7 +9,7 @@ config HAVE_DOT_CONFIG
 	bool
 	default y
 
-comment "Busybox Settings"
+menu "Busybox Settings"
 
 menu "General Configuration"
 
@@ -384,6 +384,8 @@ endmenu
 
 source libbb/Config.in
 
+endmenu
+
 comment "Applets"
 
 source archival/Config.in
diff --git a/Makefile b/Makefile
index f255394ff..64293b8c7 100644
--- a/Makefile
+++ b/Makefile
@@ -162,7 +162,7 @@ help:
 
 ifneq ($(strip $(HAVE_DOT_CONFIG)),y)
 # Default target if none was requested explicitly
-all: defconfig menuconfig ;
+all: menuconfig ;
 
 ifneq ($(filter-out $(noconfig_targets),$(MAKECMDGOALS)),)
 # warn if no configuration exists and we are asked to build a non-config target
@@ -191,6 +191,7 @@ scripts/config/mconf: scripts/config/Makefile
 	$(Q)$(MAKE) -C scripts/config ncurses conf mconf
 
 menuconfig: scripts/config/mconf
+	@[ -f .config ] || make $(MAKEFLAGS) defconfig
 	@./scripts/config/mconf $(CONFIG_CONFIG_IN)
 
 config: scripts/config/conf