diff --git a/debian/changelog b/debian/changelog
index b588b01dd..e6f917ad6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -106,6 +106,10 @@ linux (3.2.28-1) UNRELEASED; urgency=low
     (Closes: #668211)
   * [alpha] Use gcc-4.6 (Closes: #685894)
     - Use large data model to work around link failure
+  * [i386/486] video: Change FB_GEODE_LX from built-in to module (lxfb)
+    (Closes: #686528)
+  * [i386/686-pae] video: Disable Geode framebuffer drivers, not used with
+    any chips that support PAE
 
   [ Bastian Blank ]
   * Make xen-linux-system meta-packages depend on xen-system. This allows
diff --git a/debian/config/i386/none/config.486 b/debian/config/i386/none/config.486
index dad30ba4f..7d86f606a 100644
--- a/debian/config/i386/none/config.486
+++ b/debian/config/i386/none/config.486
@@ -136,7 +136,10 @@ CONFIG_MOXA_INTELLIO=m
 ##
 ## file: drivers/video/geode/Kconfig
 ##
-CONFIG_FB_GEODE_LX=y
+CONFIG_FB_GEODE=y
+CONFIG_FB_GEODE_LX=m
+CONFIG_FB_GEODE_GX=m
+CONFIG_FB_GEODE_GX1=m
 
 ##
 ## file: mm/Kconfig
diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config
index 160b9b6d3..c8faeecb2 100644
--- a/debian/config/kernelarch-x86/config
+++ b/debian/config/kernelarch-x86/config
@@ -1502,6 +1502,11 @@ CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_FONT_8x8=y
 CONFIG_FONT_8x16=y
 
+##
+## file: drivers/video/geode/Kconfig
+##
+# CONFIG_FB_GEODE is not set
+
 ##
 ## file: drivers/watchdog/Kconfig
 ##
diff --git a/debian/config/kernelarch-x86/config-arch-32 b/debian/config/kernelarch-x86/config-arch-32
index edb043572..a7b5a3396 100644
--- a/debian/config/kernelarch-x86/config-arch-32
+++ b/debian/config/kernelarch-x86/config-arch-32
@@ -476,14 +476,6 @@ CONFIG_FB_SAVAGE_I2C=y
 ##
 CONFIG_MDA_CONSOLE=m
 
-##
-## file: drivers/video/geode/Kconfig
-##
-CONFIG_FB_GEODE=y
-CONFIG_FB_GEODE_LX=m
-CONFIG_FB_GEODE_GX=m
-CONFIG_FB_GEODE_GX1=m
-
 ##
 ## file: drivers/watchdog/Kconfig
 ##
diff --git a/debian/config/kernelarch-x86/config-arch-64 b/debian/config/kernelarch-x86/config-arch-64
index aab869117..1d2d43478 100644
--- a/debian/config/kernelarch-x86/config-arch-64
+++ b/debian/config/kernelarch-x86/config-arch-64
@@ -101,11 +101,6 @@ CONFIG_FB_MATROX_MAVEN=m
 # CONFIG_FB_ATY_GENERIC_LCD is not set
 # CONFIG_FB_SAVAGE_I2C is not set
 
-##
-## file: drivers/video/geode/Kconfig
-##
-# CONFIG_FB_GEODE is not set
-
 ##
 ## file: init/Kconfig
 ##