diff --git a/docs/buildroot.html b/docs/buildroot.html
index b02ee3d6cf..2d5531f693 100644
--- a/docs/buildroot.html
+++ b/docs/buildroot.html
@@ -685,21 +685,12 @@ $ make me<TAB>
 
      <p>Maybe, there will also be a possibility to supply an
      <code>&quot;URL&quot;</code> to a patch available on Internet. </p>
-<pre>
-export BUILDROOT_USE_XWINDOWS &lt;&gt;
-</pre>
 
      <p>
 	If there is no linux config file available,
 	buildroot starts the linux configuration system, which
-	defaults to "make menuconfig". There is a menuoption
-	allowing you to use the less archaic "make  xconfig"
-	You can override any .config setting by defining
-	the BUILDROOT_USE_XWINDOWS environment variable.
+	defaults to "make menuconfig".
      </p>
-
-
-
     </ol>
 
     <h2><a name="Todo" id="Todo"></a>Todo</h2>
diff --git a/target/linux/Makefile.in.advanced b/target/linux/Makefile.in.advanced
index 93cd0c8afb..aa90e4a61e 100644
--- a/target/linux/Makefile.in.advanced
+++ b/target/linux/Makefile.in.advanced
@@ -109,17 +109,12 @@ endif
 endif
 endif
 
-# Override config method with shell variable
-ifneq ($(BUILDROOT_USE_XWINDOWS),)
-KERNEL_CONFIG_METHOD:=xconfig
-#"))
-else
 KERNEL_CONFIG_METHOD:=$(strip $(subst ",,$(BR2_KERNEL_CONFIG_METHOD)))
 #"))
 ifeq ($(KERNEL_CONFIG_METHOD),)
 KERNEL_CONFIG_METHOD:=menuconfig
 endif
-endif
+
 # -----------------------------------------------------------------------------
 ifndef LINUX26_FORMAT
 ifneq ($(strip $(subst ",,$(BR2_PACKAGE_LINUX_FORMAT))),)