diff --git a/debian/changelog b/debian/changelog
index a36b7c03f..eece8e132 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,7 +20,7 @@ linux-2.6 (2.6.30~rc4-1~experimental.1) UNRELEASED; urgency=low
     UIO_AEC, CRYPTO_ZLIB, REGULATOR_FIXED_VOLTAGE, NOP_USB_XCEIV,
     POHMELFS, FSCACHE, CACHEFILES, EXOFS, NFS_FSCACHE, AFS_FSCACHE,
     MTD_NAND_NANDSIM.
-  * [x86] set new DELL_WMI, EDAC_AMD8131, EDAC_AMD8111, X86_PAT.
+  * [x86] set new DELL_WMI, EDAC_AMD8131, EDAC_AMD8111, X86_PAT, DMAR.
   * [x86_64] set new CRYPTO_AES_NI_INTEL.
 
   [ Ben Hutchings ]
diff --git a/debian/config/amd64/config b/debian/config/amd64/config
index 922fc3426..62d850d76 100644
--- a/debian/config/amd64/config
+++ b/debian/config/amd64/config
@@ -60,7 +60,10 @@ CONFIG_HOTPLUG_CPU=y
 # CONFIG_CMDLINE_BOOL is not set
 CONFIG_PCI=y
 CONFIG_PCI_MMCONFIG=y
-# CONFIG_DMAR is not set
+CONFIG_DMAR=y
+# CONFIG_DMAR_DEFAULT_ON is not set
+CONFIG_DMAR_GFX_WA=y
+CONFIG_DMAR_FLOPPY_WA=y
 CONFIG_INTR_REMAP=y
 CONFIG_IA32_EMULATION=y
 CONFIG_IA32_AOUT=y
diff --git a/debian/config/i386/config b/debian/config/i386/config
index 8a1a3213e..8621cf5b0 100644
--- a/debian/config/i386/config
+++ b/debian/config/i386/config
@@ -86,7 +86,10 @@ CONFIG_PCI=y
 CONFIG_PCI_GOANY=y
 ## end choice
 CONFIG_PCI_MMCONFIG=y
-# CONFIG_DMAR is not set
+CONFIG_DMAR=y
+# CONFIG_DMAR_DEFAULT_ON is not set
+CONFIG_DMAR_GFX_WA=y
+CONFIG_DMAR_FLOPPY_WA=y
 CONFIG_ISA=y
 CONFIG_SCx200=m
 CONFIG_SCx200HR_TIMER=m