diff --git a/debian/changelog b/debian/changelog
index 79bd8f210..2ed8473da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,6 +24,7 @@ linux-2.6 (3.2.1-1~experimental.1) UNRELEASED; urgency=low
   * Input: ALPS - add support for protocol versions 3 and 4
     (Closes: #618422, #648207)
   * [powerpc/powerpc64] udeb: Drop zlib-modules; ZLIB_DEFLATE is built-in
+  * [amd64] iommu: Enable INTEL_IOMMU, INTEL_IOMMU_FLOPPY_WA
 
   [ Bastian Blank ]
   * [amd64] crypt: Enable some amd64 only ciphers.
diff --git a/debian/config/kernelarch-x86/config-arch-64 b/debian/config/kernelarch-x86/config-arch-64
index f7e7032de..13b1bfbe3 100644
--- a/debian/config/kernelarch-x86/config-arch-64
+++ b/debian/config/kernelarch-x86/config-arch-64
@@ -75,6 +75,9 @@ CONFIG_MOUSE_PS2_TRACKPOINT=y
 ##
 CONFIG_AMD_IOMMU=y
 # CONFIG_AMD_IOMMU_STATS is not set
+CONFIG_INTEL_IOMMU=y
+# CONFIG_INTEL_IOMMU_DEFAULT_ON is not set
+CONFIG_INTEL_IOMMU_FLOPPY_WA=y
 
 ##
 ## file: drivers/macintosh/Kconfig