diff --git a/debian/changelog b/debian/changelog
index f34225a45..718b6bf2f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -38,10 +38,10 @@ linux-2.6 (2.6.22~rc4-1~experimental.1) UNRELEASED; urgency=low
 
   [ Gordon Farquharson ]
   * arm/ixp4xx: Update NPE driver for 2.6.22.
-  * arm: Mark CHELSIO_T3, NETXEN_NIC, BCM43XX, and VIDEO_BT848 as broken
-    on ARM.
+  * arm: Mark CHELSIO_T3, NETXEN_NIC, BCM43XX, VIDEO_BT848,
+    DVB_B2C2_FLEXCOP, and DVB_BUDGET as broken on ARM.
 
- -- Gordon Farquharson <gordonfarquharson@gmail.com>  Tue,  5 Jun 2007 20:44:44 -0600
+ -- Gordon Farquharson <gordonfarquharson@gmail.com>  Tue,  5 Jun 2007 22:37:06 -0600
 
 linux-2.6 (2.6.21-3) UNRELEASED; urgency=low
 
diff --git a/debian/patches/bugfix/arm/disable-broken-config-options-1.patch b/debian/patches/bugfix/arm/disable-broken-config-options-1.patch
index 92f4c33bf..462704682 100644
--- a/debian/patches/bugfix/arm/disable-broken-config-options-1.patch
+++ b/debian/patches/bugfix/arm/disable-broken-config-options-1.patch
@@ -41,3 +41,26 @@ diff -Naur a/drivers/media/video/bt8xx/Kconfig b/drivers/media/video/bt8xx/Kconf
  	select I2C_ALGOBIT
  	select FW_LOADER
  	select VIDEO_BTCX
+diff -Naur a/drivers/media/dvb/b2c2/Kconfig b/drivers/media/dvb/b2c2/Kconfig
+--- a/drivers/media/dvb/b2c2/Kconfig    2007-05-26 02:12:02.000000000 -0600
++++ b/drivers/media/dvb/b2c2/Kconfig    2007-06-05 22:02:44.000000000 -0600
+@@ -1,6 +1,6 @@
+ config DVB_B2C2_FLEXCOP
+ 	tristate "Technisat/B2C2 FlexCopII(b) and FlexCopIII adapters"
+-	depends on DVB_CORE && I2C
++	depends on DVB_CORE && I2C && (!ARM || BROKEN)
+ 	select DVB_PLL
+ 	select DVB_STV0299 if !DVB_FE_CUSTOMISE
+ 	select DVB_MT352 if !DVB_FE_CUSTOMISE
+diff -Naur a/drivers/media/dvb/ttpci/Kconfig b/drivers/media/dvb/ttpci/Kconfig
+--- a/drivers/media/dvb/ttpci/Kconfig   2007-05-26 02:12:02.000000000 -0600
++++ b/drivers/media/dvb/ttpci/Kconfig   2007-06-05 22:01:34.000000000 -0600
+@@ -59,7 +59,7 @@
+
+ config DVB_BUDGET
+ 	tristate "Budget cards"
+-	depends on DVB_CORE && PCI && I2C && VIDEO_V4L1
++	depends on DVB_CORE && PCI && I2C && VIDEO_V4L1 && (!ARM || BROKEN)
+ 	select VIDEO_SAA7146
+ 	select DVB_STV0299 if !DVB_FE_CUSTOMISE
+ 	select DVB_VES1X93 if !DVB_FE_CUSTOMISE