diff --git a/debian/changelog b/debian/changelog
index b21da9702..6a1bde4db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ linux (3.2.21-2) UNRELEASED; urgency=low
   * [powerpc] Enable PPC_DISABLE_WERROR (fixes FTBFS)
   * tracing/mm: Move include of trace/events/kmem.h out of header into slab.c
     (fixes FTBFS on sparc)
+  * [i386] Disable incomplete lguest support
 
  -- Ben Hutchings <ben@decadent.org.uk>  Sat, 23 Jun 2012 20:19:15 +0100
 
diff --git a/debian/config/kernelarch-x86/config-arch-32 b/debian/config/kernelarch-x86/config-arch-32
index faffc2fd6..edb043572 100644
--- a/debian/config/kernelarch-x86/config-arch-32
+++ b/debian/config/kernelarch-x86/config-arch-32
@@ -45,7 +45,7 @@ CONFIG_X86_GENERIC=y
 ##
 ## file: arch/x86/lguest/Kconfig
 ##
-CONFIG_LGUEST_GUEST=y
+# CONFIG_LGUEST_GUEST is not set
 
 ##
 ## file: crypto/Kconfig
@@ -188,7 +188,7 @@ CONFIG_LEDS_WRAP=m
 ##
 ## file: drivers/lguest/Kconfig
 ##
-CONFIG_LGUEST=m
+# CONFIG_LGUEST is not set
 
 ##
 ## file: drivers/macintosh/Kconfig