diff --git a/debian/changelog b/debian/changelog
index f02745c50..6c7512d6a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,7 @@ linux-2.6 (2.6.31~rc3-1~experimental.1) UNRELEASED; urgency=low
   * mga: remove unnecessary change from firmware-loading patch
   * cxgb3: remove PHY firmware and use request_firmware() to load it
   * Add firmware-linux-free package containing DFSG-free firmware
+  * av7110: include firmware source and binary
 
   [ Martin Michlmayr ]
   * [armel/orion5x, armel/kirkwood] Set GPIO_SYSFS=y since these
diff --git a/debian/patches/debian/dfsg/files-1 b/debian/patches/debian/dfsg/files-1
index d58dcacd9..3819b2e62 100644
--- a/debian/patches/debian/dfsg/files-1
+++ b/debian/patches/debian/dfsg/files-1
@@ -6,7 +6,6 @@ rm firmware/3com
 rm firmware/acenic
 rm firmware/adaptec
 rm firmware/advansys
-rm firmware/av7110
 rm firmware/bnx2
 rm firmware/cpia2
 rm firmware/cxgb3
diff --git a/debian/patches/debian/dfsg/firmware-cleanup.patch b/debian/patches/debian/dfsg/firmware-cleanup.patch
index e361e8833..6418e06d5 100644
--- a/debian/patches/debian/dfsg/firmware-cleanup.patch
+++ b/debian/patches/debian/dfsg/firmware-cleanup.patch
@@ -2,7 +2,7 @@ diff --git a/firmware/Makefile b/firmware/Makefile
 index 25200d1..c3a4fa8 100644
 --- a/firmware/Makefile
 +++ b/firmware/Makefile
-@@ -20,96 +20,10 @@ fw-external-y := $(subst ",,$(CONFIG_EXTRA_FIRMWARE))
+@@ -20,96 +20,11 @@ fw-external-y := $(subst ",,$(CONFIG_EXTRA_FIRMWARE))
  # accurate. In the latter case it doesn't matter -- it'll use $(fw-shipped-all).
  # But be aware that the config file might not be included at all.
  
@@ -28,7 +28,7 @@ index 25200d1..c3a4fa8 100644
 -fw-shipped-$(CONFIG_CHELSIO_T3) += cxgb3/t3b_psram-1.1.0.bin \
 -				   cxgb3/t3c_psram-1.1.0.bin \
 -				   cxgb3/t3fw-7.4.0.bin
--fw-shipped-$(CONFIG_DVB_AV7110) += av7110/bootcode.bin
+ fw-shipped-$(CONFIG_DVB_AV7110) += av7110/bootcode.bin
 -fw-shipped-$(CONFIG_DVB_TTUSB_BUDGET) += ttusb-budget/dspbootcode.bin
 -fw-shipped-$(CONFIG_E100) += e100/d101m_ucode.bin e100/d101s_ucode.bin \
 -			     e100/d102e_ucode.bin