diff --git a/debian/changelog b/debian/changelog
index dd9d7e472..ec8cef4b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -47,6 +47,8 @@ linux-2.6 (2.6.26~rc7-1~experimental.1) UNRELEASED; urgency=low
   * Add request_firmware patch for acenic. (closes: #284221)
   * [x86, ia64]: Set HPET_RTC_IRQ. (closes: #479709)
   * [ppc]: Set SND_VIRMIDI. (closes: #290090)
+  * Fallback for userspace compatibility to old IEEE 1394 FireWire stack.
+    (closes: #475295, #478419)
 
   [ Martin Michlmayr ]
   * [arm/orion5x] Update the config to reflect upstream renaming this
diff --git a/debian/config/config b/debian/config/config
index 173412a06..6a0d910a0 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -252,9 +252,7 @@ CONFIG_EDAC_I82975X=m
 ##
 ## file: drivers/firewire/Kconfig
 ##
-CONFIG_FIREWIRE=m
-CONFIG_FIREWIRE_OHCI=m
-CONFIG_FIREWIRE_SBP2=m
+# CONFIG_FIREWIRE is not set
 
 ##
 ## file: drivers/hid/Kconfig
@@ -348,7 +346,16 @@ CONFIG_BLK_DEV_TC86C001=m
 ##
 ## file: drivers/ieee1394/Kconfig
 ##
-# CONFIG_IEEE1394 is not set
+CONFIG_IEEE1394=m
+# CONFIG_IEEE1394_VERBOSEDEBUG is not set
+CONFIG_IEEE1394_PCILYNX=m
+CONFIG_IEEE1394_OHCI1394=m
+CONFIG_IEEE1394_VIDEO1394=m
+CONFIG_IEEE1394_SBP2=m
+# CONFIG_IEEE1394_SBP2_PHYS_DMA is not set
+CONFIG_IEEE1394_ETH1394=m
+CONFIG_IEEE1394_DV1394=m
+CONFIG_IEEE1394_RAWIO=m
 
 ##
 ## file: drivers/infiniband/Kconfig