diff --git a/debian/changelog b/debian/changelog
index 934c4bdfe..e9e663e5c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -33,7 +33,8 @@ linux-2.6 (2.6.29~rc8-1~experimental.1) UNRELEASED; urgency=low
     SCHED_OMIT_FRAME_POINTER, DCB, IXGBE_DCB.
   * topconfig enable SND_HDA_HWDEP for sound debugging purpose.
   * topconfig enable USB_HIDDEV (closes: #517771)
-  * [x86] set DELL_LAPTOP, COMEDI, X86_PTRACE_BTS, XENFS, XEN_COMPAT_XENFS.
+  * [x86] set DELL_LAPTOP, COMEDI, X86_PTRACE_BTS, XENFS, XEN_COMPAT_XENFS,
+    X86_REROUTE_FOR_BROKEN_BOOT_IRQS.
   * [x86] unset DRM_I915_KMS due to upgrade path from Lenny override with
     modeset module param.
   * temp.image.plain/preinst: Consistent output.
diff --git a/debian/config/amd64/config b/debian/config/amd64/config
index 4ca70f2f5..47c675547 100644
--- a/debian/config/amd64/config
+++ b/debian/config/amd64/config
@@ -27,6 +27,7 @@ CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT=y
 CONFIG_AMD_IOMMU=y
 # CONFIG_AMD_IOMMU_STATS is not set
 # CONFIG_MAXSMP is not set
+CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
 CONFIG_SCHED_SMT=y
 CONFIG_SCHED_MC=y
 CONFIG_X86_MCE=y
diff --git a/debian/config/i386/config b/debian/config/i386/config
index 6d8c568e2..059945227 100644
--- a/debian/config/i386/config
+++ b/debian/config/i386/config
@@ -30,6 +30,7 @@ CONFIG_PARAVIRT=y
 # CONFIG_PARAVIRT_DEBUG is not set
 # CONFIG_MEMTEST is not set
 # CONFIG_MAXSMP is not set
+CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
 CONFIG_HPET_TIMER=y
 CONFIG_SCHED_SMT=y
 CONFIG_SCHED_MC=y