diff --git a/debian/changelog b/debian/changelog
index faee9a579..22304ab7b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,7 +10,7 @@ linux-2.6 (2.6.27~rc6-1~experimental.1) UNRELEASED; urgency=low
     USB_GSPCA, USB_S2255, OCFS2_FS_STATS, OMFS_FS, CRYPTO_RMD128,
     CRYPTO_RMD160, CRYPTO_RMD256, CRYPTO_RMD320.
   * [x86] set MOUSE_BCM5974.
-  * [x86_64] set AMD_IOMMU.
+  * [x86_64] set AMD_IOMMU, MTRR_SANITIZER.
 
   [ Martin Michlmayr ]
   * [mips/r4k-ip22, mips/sb1-bcm91250a] Don't build in ISO9660.
diff --git a/debian/config/amd64/config b/debian/config/amd64/config
index 4b5655041..358abbf77 100644
--- a/debian/config/amd64/config
+++ b/debian/config/amd64/config
@@ -34,6 +34,9 @@ CONFIG_X86_MSR=m
 CONFIG_X86_CPUID=m
 CONFIG_NODES_SHIFT=6
 CONFIG_MTRR=y
+CONFIG_MTRR_SANITIZER=y
+CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0
+CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
 # CONFIG_X86_PAT is not set
 CONFIG_EFI=y
 CONFIG_SECCOMP=y