diff --git a/docs/ct-ng.1.in b/docs/ct-ng.1.in
index 7526ccf4..88388e1a 100644
--- a/docs/ct-ng.1.in
+++ b/docs/ct-ng.1.in
@@ -60,7 +60,7 @@ Samples can be later recalled by calling
 with the target tuple they represent.
 ."
 .TP
-.B defconfig
+.B savedefconfig
 Save the current configuration to a mini-defconfig file, that contains only
 the strictly required symbols to reproduce the configuration. defconfig files
 are much smaller than a complete .config, so it is easy to send by mail. As
@@ -87,11 +87,11 @@ saved. Use
 for that
 ."
 .TP
-.B olddefconfig
+.B defconfig
 Configure
 .B crosstool-NG
 using a mini-defconfig file (previously saved with
-.B defconfig
+.B savedefconfig
 or manually edited). The default mini-defconfig is read from the file
 .IR defconfig ,
 unless the variable
diff --git a/kconfig/kconfig.mk b/kconfig/kconfig.mk
index bf69cbf7..cb9f91c0 100644
--- a/kconfig/kconfig.mk
+++ b/kconfig/kconfig.mk
@@ -29,11 +29,11 @@ oldconfig: .config
 
 savedefconfig: .config
 	@$(ECHO) '  GEN   $@'
-	$(SILENT)$(CONF) --savedefconfig=$${CONFIG-defconfig} $(KCONFIG_TOP)
+	$(SILENT)$(CONF) --savedefconfig=$${DEFCONFIG-defconfig} $(KCONFIG_TOP)
 
 defconfig:
 	@$(ECHO) '  CONF  $@'
-	$(SILENT)$(CONF) --defconfig=$${CONFIG-defconfig} $(KCONFIG_TOP)
+	$(SILENT)$(CONF) --defconfig=$${DEFCONFIG-defconfig} $(KCONFIG_TOP)
 
 # Always be silent, the stdout an be >.config
 extractconfig:
@@ -58,6 +58,6 @@ help-config::
 	@echo  '  oldconfig          - Update current config using a provided .config as base'
 	@echo  '  extractconfig      - Extract to stdout the configuration items from a'
 	@echo  '                       build.log file piped to stdin'
-	@echo  '  defconfig          - Save current config as a mini-defconfig to $${CONFIG}'
-	@echo  '  olddefconfig       - Update config from a mini-defconfig $${CONFIG}'
-	@echo  '                       (default: $${CONFIG}=./defconfig)'
+	@echo  '  savedefconfig      - Save current config as a mini-defconfig to $${DEFCONFIG}'
+	@echo  '  defconfig          - Update config from a mini-defconfig $${DEFCONFIG}'
+	@echo  '                       (default: $${DEFCONFIG}=./defconfig)'