diff --git a/[refs] b/[refs]
index 58a98dd6b9c1..5ceac2d2502e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 409f117e2d6b38d714ab26def840801e33dfe115
+refs/heads/master: c2838e6ee2d2eae893646f9a271039ae434ed760
diff --git a/trunk/scripts/kconfig/Makefile b/trunk/scripts/kconfig/Makefile
index 3091794e9354..231b4759c714 100644
--- a/trunk/scripts/kconfig/Makefile
+++ b/trunk/scripts/kconfig/Makefile
@@ -11,6 +11,9 @@ else
 Kconfig := Kconfig
 endif
 
+# We need this, in case the user has it in its environment
+unexport CONFIG_
+
 xconfig: $(obj)/qconf
 	$< $(Kconfig)