diff --git a/srcpkgs/linux-firmware-dvb/template b/srcpkgs/linux-firmware-dvb/template
index b51795a094..08207bee2c 100644
--- a/srcpkgs/linux-firmware-dvb/template
+++ b/srcpkgs/linux-firmware-dvb/template
@@ -1,7 +1,7 @@
 # Template file for 'linux-firmware-dvb'
 pkgname=linux-firmware-dvb
 version=20170329
-revision=2
+revision=3
 _gitrev=3fef04a4a4bfeba88ae3b20aff9d3a1fabf1c159
 short_desc="Linux TV firmware package"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
@@ -13,7 +13,7 @@ distfiles="
  https://linuxtv.org/downloads/firmware/dvb-firmwares.tar.bz2"
 checksum="
  69448effa96ec0a0777923b68820dd139720f48295aad6a4aea384c0def464a3
- 788a3c5aa77a9a3069e2b60e2502acd417c6e97cdb8f8bf9502aa0c2a4244b5f"
+ 02e9ee1c9cf45db53c4a76a444ea9d8fe8bdb62c624c10ef548d50affa59a1d8"
 
 do_extract() {
 	mkdir -p ${wrksrc}
@@ -61,9 +61,6 @@ do_install() {
 	firmwares+=" dvb-fe-cx24116.fw"
 	firmwares+=" dvb-fe-cx24117.fw"
 	firmwares+=" dvb-fe-cx24120-1.20.58.2.fw"
-	firmwares+=" dvb-fe-drxj-mc-1.0.8.fw"
-	firmwares+=" dvb-fe-drxj-mc-vsb-1.0.8.fw"
-	firmwares+=" dvb-fe-drxj-mc-vsb-qam-1.0.8.fw"
 	firmwares+=" dvb-fe-ds3000.fw"
 	firmwares+=" dvb-fe-ds300x.fw"
 	firmwares+=" dvb-fe-ds3103.fw"
@@ -81,7 +78,6 @@ do_install() {
 	firmwares+=" dvb-fe-xc4000-1.4.fw"
 	firmwares+=" dvb-fe-xc5000-1.6.114.fw"
 	firmwares+=" dvb-fe-xc5000c-4.1.30.7.fw"
-	rm -f dvb-firmwares.tar.bz2
 	firmwares+=" dvb-ttpci-01.fw"
 	firmwares+=" dvb-ttpci-01.fw-261a"
 	firmwares+=" dvb-ttpci-01.fw-261b"
@@ -138,7 +134,65 @@ do_install() {
 	firmwares+=" dvb_nova_12mhz.inp"
 	firmwares+=" dvb_nova_12mhz_b0.inp"
 	firmwares+=" dvb_rio.inp"
+	firmwares+=" firmware/Boot.S"
+	licenses+=" firmware/README"
+	firmwares+=" firmware/as102_data1_st.hex"
+	firmwares+=" firmware/as102_data2_st.hex"
+	firmwares+=" firmware/cmmb_vega_12mhz.inp"
+	firmwares+=" firmware/cmmb_venice_12mhz.inp"
+	firmwares+=" firmware/dvb-fe-bcm3510-01.fw"
+	firmwares+=" firmware/dvb-fe-drxj-mc-1.0.8.fw"
+	firmwares+=" firmware/dvb-fe-drxj-mc-vsb-1.0.8.fw"
+	firmwares+=" firmware/dvb-fe-drxj-mc-vsb-qam-1.0.8.fw"
+	firmwares+=" firmware/dvb-fe-or51132-qam.fw"
+	firmwares+=" firmware/dvb-fe-or51132-vsb.fw"
+	firmwares+=" firmware/dvb-fe-or51211.fw"
+	firmwares+=" firmware/dvb-fe-xc4000-1.4.1.fw"
+	firmwares+=" firmware/dvb-fe-xc5000-1.6.114.fw"
+	firmwares+=" firmware/dvb-fe-xc5000c-4.1.30.7.fw"
+	firmwares+=" firmware/dvb-ttpci-01.fw-261a"
+	firmwares+=" firmware/dvb-ttpci-01.fw-261b"
+	firmwares+=" firmware/dvb-ttpci-01.fw-261c"
+	firmwares+=" firmware/dvb-ttpci-01.fw-261d"
+	firmwares+=" firmware/dvb-ttpci-01.fw-261f"
+	firmwares+=" firmware/dvb-ttpci-01.fw-2622"
+	firmwares+=" firmware/dvb-usb-avertv-a800-02.fw"
+	firmwares+=" firmware/dvb-usb-bluebird-01.fw"
+	firmwares+=" firmware/dvb-usb-dib0700-1.20.fw"
+	firmwares+=" firmware/dvb-usb-dibusb-5.0.0.11.fw"
+	firmwares+=" firmware/dvb-usb-dibusb-6.0.0.8.fw"
+	firmwares+=" firmware/dvb-usb-dtt200u-01.fw"
+	firmwares+=" firmware/dvb-usb-it9135-01.fw"
+	firmwares+=" firmware/dvb-usb-it9135-02.fw"
+	firmwares+=" firmware/dvb-usb-terratec-h5-drxk.fw"
+	firmwares+=" firmware/dvb-usb-terratec-h7-az6007.fw"
+	firmwares+=" firmware/dvb-usb-terratec-h7-drxk.fw"
+	firmwares+=" firmware/dvb-usb-umt-010-02.fw"
+	firmwares+=" firmware/dvb-usb-vp702x-01.fw"
+	firmwares+=" firmware/dvb-usb-vp7045-01.fw"
+	firmwares+=" firmware/dvb-usb-wt220u-01.fw"
+	firmwares+=" firmware/dvb-usb-wt220u-02.fw"
+	firmwares+=" firmware/dvb_nova_12mhz.inp"
+	firmwares+=" firmware/dvb_nova_12mhz_b0.inp"
+	firmwares+=" firmware/isdbt_nova_12mhz.inp"
+	firmwares+=" firmware/isdbt_nova_12mhz_b0.inp"
+	firmwares+=" firmware/isdbt_rio.inp"
+	firmwares+=" firmware/sms1xxx-hcw-55xxx-dvbt-02.fw"
+	firmwares+=" firmware/sms1xxx-hcw-55xxx-isdbt-02.fw"
+	firmwares+=" firmware/sms1xxx-nova-a-dvbt-01.fw"
+	firmwares+=" firmware/sms1xxx-nova-b-dvbt-01.fw"
+	firmwares+=" firmware/sms1xxx-stellar-dvbt-01.fw"
+	firmwares+=" firmware/tdmb_nova_12mhz.inp"
+	firmwares+=" firmware/v4l-cx231xx-avcore-01.fw"
+	firmwares+=" firmware/v4l-cx23418-apu.fw"
+	firmwares+=" firmware/v4l-cx23418-cpu.fw"
+	firmwares+=" firmware/v4l-cx23418-dig.fw"
+	firmwares+=" firmware/v4l-cx23885-avcore-01.fw"
+	firmwares+=" firmware/v4l-cx23885-enc-broken.fw"
+	firmwares+=" firmware/v4l-cx23885-enc.fw"
+	firmwares+=" firmware/v4l-cx25840.fw"
 	firmwares+=" go7007/go7007fw.bin"
+	firmwares+=" go7007/go7007tv.bin"
 	firmwares+=" go7007/lr192.fw"
 	firmwares+=" go7007/px-m402u.fw"
 	firmwares+=" go7007/px-tv402u.fw"
@@ -177,7 +231,6 @@ do_install() {
 	firmwares+=" v4l-cx2341x-enc.fw"
 	firmwares+=" v4l-cx2341x-init.mpg"
 	firmwares+=" v4l-cx23885-avcore-01.fw"
-	firmwares+=" v4l-cx23885-enc-broken.fw"
 	firmwares+=" v4l-cx23885-enc.fw"
 	firmwares+=" v4l-cx25840.fw"
 	firmwares+=" v4l-pvrusb2-24xxx-01.fw"
@@ -198,7 +251,11 @@ do_install() {
 		file=${f##*/}
 		if [ "${file}" != "${f}" ]; then
 			dir=${f%/*}
-			vinstall ${f} 0644 usr/lib/firmware/${dir}
+			if [ "${dir}" != "firmware" ]; then
+				vinstall ${f} 0644 usr/lib/firmware/${dir}
+			else
+				vinstall ${f} 0644 usr/lib/firmware
+			fi
 		else
 			vinstall ${f} 0644 usr/lib/firmware
 		fi