diff --git a/debian/changelog b/debian/changelog
index dfb9e31a5..53bfadb77 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,7 @@ linux-2.6 (3.2.1-1~experimental.1) UNRELEASED; urgency=low
     (Closes: #618422, #648207)
   * [powerpc/powerpc64] udeb: Drop zlib-modules; ZLIB_DEFLATE is built-in
   * [amd64] iommu: Enable INTEL_IOMMU, INTEL_IOMMU_FLOPPY_WA, IRQ_REMAP
+  * [amd64] cpufreq: Enable X86_P4_CLOCKMOD (Closes: #656328)
 
   [ Bastian Blank ]
   * [amd64] crypt: Enable some amd64 only ciphers.
diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config
index 460420834..bfa4bc553 100644
--- a/debian/config/kernelarch-x86/config
+++ b/debian/config/kernelarch-x86/config
@@ -331,7 +331,7 @@ CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
 CONFIG_X86_PCC_CPUFREQ=m
 CONFIG_X86_ACPI_CPUFREQ=m
 CONFIG_X86_SPEEDSTEP_CENTRINO=m
-# CONFIG_X86_P4_CLOCKMOD is not set
+CONFIG_X86_P4_CLOCKMOD=m
 
 ##
 ## file: drivers/cpuidle/Kconfig
diff --git a/debian/config/kernelarch-x86/config-arch-32 b/debian/config/kernelarch-x86/config-arch-32
index 1232e3e5e..4bf0a5381 100644
--- a/debian/config/kernelarch-x86/config-arch-32
+++ b/debian/config/kernelarch-x86/config-arch-32
@@ -124,7 +124,6 @@ CONFIG_X86_SPEEDSTEP_CENTRINO=m
 CONFIG_X86_SPEEDSTEP_CENTRINO_TABLE=y
 CONFIG_X86_SPEEDSTEP_ICH=m
 CONFIG_X86_SPEEDSTEP_SMI=m
-CONFIG_X86_P4_CLOCKMOD=m
 CONFIG_X86_CPUFREQ_NFORCE2=m
 CONFIG_X86_LONGRUN=m
 CONFIG_X86_LONGHAUL=m