diff --git a/debian/changelog b/debian/changelog
index baaf962a4..84065b6c0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,8 @@ linux-2.6 (2.6.36-1~experimental.1) UNRELEASED; urgency=low
     (Closes: #598533)
   * [x86] ata_piix: Add device ID for ICH4-L
   * [armel/iop32x,ia64,x86] Disable BLK_DEV_PIIX as obsolete
+  * [amd64] Disable DRM_I810; i81x chipsets do not support 64-bit processors
+  * [x86] Disable DRM_I830; the i915 driver is now used instead
 
   [ Martin Michlmayr ]
   * Revert "orion/kirkwood: reset PCIe unit on boot" since it breaks
diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config
index 9e03888fa..dcdaec7e7 100644
--- a/debian/config/kernelarch-x86/config
+++ b/debian/config/kernelarch-x86/config
@@ -393,9 +393,9 @@ CONFIG_DRM=m
 CONFIG_DRM_TDFX=m
 CONFIG_DRM_R128=m
 CONFIG_DRM_RADEON=m
-CONFIG_DRM_I810=m
+# CONFIG_DRM_I810 is not set
 ## choice: Intel 830M, 845G, 852GM, 855GM, 865G
-CONFIG_DRM_I830=m
+# CONFIG_DRM_I830 is not set
 CONFIG_DRM_I915=m
 # CONFIG_DRM_I915_KMS is not set
 ## end choice
diff --git a/debian/config/kernelarch-x86/config-arch-32 b/debian/config/kernelarch-x86/config-arch-32
index 53c2ff4e8..cfbc2f20a 100644
--- a/debian/config/kernelarch-x86/config-arch-32
+++ b/debian/config/kernelarch-x86/config-arch-32
@@ -143,6 +143,11 @@ CONFIG_AGP_EFFICEON=y
 ##
 CONFIG_CRYPTO_DEV_GEODE=m
 
+##
+## file: drivers/gpu/drm/Kconfig
+##
+CONFIG_DRM_I810=m
+
 ##
 ## file: drivers/i2c/busses/Kconfig
 ##