Index: Makefile
===================================================================
--- Makefile	(revision 4b42382064b00ac4b4468f67cbf56346d06494e5)
+++ Makefile	(revision 45b26114971f5c084a8e07c2f5740ed79d8a539a)
@@ -132,14 +132,14 @@
 config_default $(CONFIG_MAKEFILE) $(CONFIG_HEADER): $(CONFIG_RULES)
 ifeq ($(HANDS_OFF),y)
-	$(CONFIG) $< hands-off $(PROFILE)
+	$(CONFIG) $< defaults hands-off $(PROFILE)
 else
-	$(CONFIG) $< default $(PROFILE)
+	$(CONFIG) $< defaults default $(PROFILE)
 endif
 
 config: $(CONFIG_RULES)
-	$(CONFIG) $<
+	$(CONFIG) $< defaults
 
 random-config: $(CONFIG_RULES)
-	$(CONFIG) $< random
+	$(CONFIG) $< defaults random
 
 # Release files
Index: tools/config.py
===================================================================
--- tools/config.py	(revision 4b42382064b00ac4b4468f67cbf56346d06494e5)
+++ tools/config.py	(revision 45b26114971f5c084a8e07c2f5740ed79d8a539a)
@@ -43,11 +43,12 @@
 
 ARGPOS_RULES = 1
-ARGPOS_CHOICE = 2
-ARGPOS_PRESET = 3
+ARGPOS_PRESETS_DIR = 2
+ARGPOS_CHOICE = 3
+ARGPOS_PRESET = 4
 
 RULES_FILE = sys.argv[ARGPOS_RULES]
 MAKEFILE = 'Makefile.config'
 MACROS = 'config.h'
-PRESETS_DIR = 'defaults'
+PRESETS_DIR = sys.argv[ARGPOS_PRESETS_DIR]
 
 class BinaryOp: