diff --git a/debian/changelog b/debian/changelog
index 8792ad79b..ac75990cf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -31,6 +31,8 @@ linux-2.6 (2.6.29~rc7-1~experimental.1) UNRELEASED; urgency=low
   * topconfig enable SND_HDA_HWDEP for sound debugging purpose.
   * topconfig enable USB_HIDDEV (closes: #517771)
   * [x86] set DELL_LAPTOP.
+  * [x86] unset DRM_I915_KMS due to upgrade path from Lenny override with
+    modeset module param.
 
   [ Bastian Blank ]
   * Use external source directory for all builds.
diff --git a/debian/config/amd64/config b/debian/config/amd64/config
index 7d5143636..203892c3f 100644
--- a/debian/config/amd64/config
+++ b/debian/config/amd64/config
@@ -298,7 +298,7 @@ CONFIG_AGP_SIS=m
 CONFIG_AGP_VIA=m
 
 ##
-## file: drivers/char/drm/Kconfig
+## file: drivers/gpu/drm/Kconfig
 ##
 CONFIG_DRM=m
 CONFIG_DRM_TDFX=m
@@ -309,6 +309,7 @@ CONFIG_DRM_I810=m
 CONFIG_DRM_I830=m
 CONFIG_DRM_I915=m
 ## end choice
+# CONFIG_DRM_I915_KMS is not set
 CONFIG_DRM_MGA=m
 CONFIG_DRM_SIS=m
 
diff --git a/debian/config/i386/config b/debian/config/i386/config
index d14c84688..d22fcc958 100644
--- a/debian/config/i386/config
+++ b/debian/config/i386/config
@@ -382,7 +382,7 @@ CONFIG_AGP_VIA=m
 CONFIG_AGP_EFFICEON=m
 
 ##
-## file: drivers/char/drm/Kconfig
+## file: drivers/gpu/drm/Kconfig
 ##
 CONFIG_DRM=m
 CONFIG_DRM_TDFX=m
@@ -393,6 +393,7 @@ CONFIG_DRM_I810=m
 CONFIG_DRM_I830=m
 CONFIG_DRM_I915=m
 ## end choice
+# CONFIG_DRM_I915_KMS is not set
 CONFIG_DRM_MGA=m
 CONFIG_DRM_SIS=m