diff --git a/debian/changelog b/debian/changelog
index b3a4b71d9..ebe63b1bb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+linux-2.6 (2.6.32-7) UNRELEASED; urgency=low
+
+  * [x86] Disable deprecated X86_CPU_DEBUG, causes boot failures.
+
+ -- maximilian attems <maks@debian.org>  Mon, 01 Feb 2010 17:16:31 +0100
+
 linux-2.6 (2.6.32-6) unstable; urgency=high
 
   [ Ben Hutchings ]
diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config
index 47edfc8e7..e8dea8561 100644
--- a/debian/config/kernelarch-x86/config
+++ b/debian/config/kernelarch-x86/config
@@ -34,7 +34,7 @@ CONFIG_MICROCODE_INTEL=y
 CONFIG_MICROCODE_AMD=y
 CONFIG_X86_MSR=m
 CONFIG_X86_CPUID=m
-CONFIG_X86_CPU_DEBUG=m
+# CONFIG_X86_CPU_DEBUG is not set
 CONFIG_NODES_SHIFT=6
 # CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
 CONFIG_X86_RESERVE_LOW_64K=y