diff --git a/packages/network/extra-firmwares-nonfree/config/packages.ini b/packages/network/extra-firmwares-nonfree/config/packages.ini
new file mode 100644
index 0000000000..caa9bcf8b1
--- /dev/null
+++ b/packages/network/extra-firmwares-nonfree/config/packages.ini
@@ -0,0 +1,508 @@
+[Firmwares/]
+name=Firmwares for drivers
+file=http://www.geexbox.org/firmwares/
+dir=iso/GEEXBOX/firmware/
+
+[Firmwares/WiFi/]
+name=Firmwares for Wireless drivers
+file=WiFi/
+
+[Firmwares/WiFi/ACX100]
+name=ACX100 Firmware
+file=acx/default/tiacx100
+md5=24a54fd30f7658fcbffc825b0dd7aa5b
+file=acx/default/tiacx100r0D
+md5=1c7413e7b0be4ef7d1e424a132e17fab
+file=acx/default/tiacx100r11
+md5=a150750ad33c512edc4afee5270b37cb
+file=acx/default/tiacx100r15
+md5=c99d01d4fcf0d6cc00441aff60690be4
+
+[Firmwares/WiFi/ACX100USB]
+name=ACX100USB Firmware
+file=acx/default/tiacx100usb
+md5=7a5591e8c6af927c85f4798c5cf15389
+
+[Firmwares/WiFi/ACX111]
+name=ACX111 Firmware
+file=acx/default/tiacx111c16
+md5=7026826460376f6b174f9225bd7781b9
+file=acx/default/tiacx111c17
+md5=95552544ca6d2b4e8c6aeb80b8ae7fdf
+file=acx/default/tiacx111c19
+md5=a1fa9681e297b4e36e257090fc12265a
+
+[Firmwares/WiFi/ACX111USB]
+name=ACX111USB Firmware
+file=acx/acx111_2.4.0.70-USB/tiacx111usbc1B.bz2
+md5=03e1fa1167ebfd75791f058bf363de24
+
+[Firmwares/WiFi/B43]
+name=Broadcom BCM43xx (Apple AirPort ...) Firmware
+dir=iso/GEEXBOX/firmware/b43/
+file=b43/a0g0bsinitvals4.fw.bz2
+md5=9b436e014193def20a6e7a08c1b10dcf
+file=b43/a0g0bsinitvals5.fw.bz2
+md5=5accfa75590c2d9ca9e92af1a4df19d7
+file=b43/a0g0bsinitvals9.fw.bz2
+md5=aa57497627c2a4c1a07b7f68a9ee8ca3
+file=b43/a0g0initvals4.fw.bz2
+md5=83fa76f1dc2d74d1495ac0ab7b73e4b0
+file=b43/a0g0initvals5.fw.bz2
+md5=a450e12b495b95f930bd75482ef879d1
+file=b43/a0g0initvals9.fw.bz2
+md5=fad2968a0b237b5cac6760bb9a6333a2
+file=b43/a0g1bsinitvals13.fw.bz2
+md5=49d94d37fcdd1fbe76c18b7a2e0f8a8b
+file=b43/a0g1bsinitvals5.fw.bz2
+md5=6f286fdc9c8fc883f537694e3a48daf8
+file=b43/a0g1bsinitvals9.fw.bz2
+md5=5b339cded95c7f7babfddec01d836e03
+file=b43/a0g1initvals13.fw.bz2
+md5=613a5d717971904b1ddfef1fa2c42c43
+file=b43/a0g1initvals5.fw.bz2
+md5=9514f6a9fc7586860b9997ab0ca0830e
+file=b43/a0g1initvals9.fw.bz2
+md5=84113f267fbfa46149b923d05d132199
+file=b43/b0g0bsinitvals13.fw.bz2
+md5=caf469cb342cf3d0eaeccd168d9014cd
+file=b43/b0g0bsinitvals4.fw.bz2
+md5=4ae4598bc6ceac217a0c090281b1d726
+file=b43/b0g0bsinitvals5.fw.bz2
+md5=de26b60def409a30c6a61e6146a0b3c2
+file=b43/b0g0bsinitvals9.fw.bz2
+md5=743b8f377465de2fc383bf81ec134696
+file=b43/b0g0initvals13.fw.bz2
+md5=26f460cd801d7a1b772aefdc9956ff67
+file=b43/b0g0initvals4.fw.bz2
+md5=288081ccee472ccd7ff7241fa9c3c36e
+file=b43/b0g0initvals5.fw.bz2
+md5=caffe49111e4cded8702d66435ca9236
+file=b43/b0g0initvals9.fw.bz2
+md5=43408b80c936eb1100d14b27ffe43187
+file=b43/lp0bsinitvals13.fw.bz2
+md5=caf469cb342cf3d0eaeccd168d9014cd
+file=b43/lp0bsinitvals14.fw.bz2
+md5=caf469cb342cf3d0eaeccd168d9014cd
+file=b43/lp0bsinitvals15.fw.bz2
+md5=caf469cb342cf3d0eaeccd168d9014cd
+file=b43/lp0initvals13.fw.bz2
+md5=661e3ed13c8541b302a31ceb4b2bf6e5
+file=b43/lp0initvals14.fw.bz2
+md5=4639f9330cd17b80f249e2e4fd541789
+file=b43/lp0initvals15.fw.bz2
+md5=6b6e8c594bc751aa3d36c73124ce3014
+file=b43/n0absinitvals11.fw.bz2
+md5=d1f2124ed09b8168796bc8070c6b6945
+file=b43/n0bsinitvals11.fw.bz2
+md5=e3d7d7fac227ed7551ce3df6235056c7
+file=b43/n0initvals11.fw.bz2
+md5=7e2821a33b823f04bffaff190cb8c740
+file=b43/pcm4.fw.bz2
+md5=57e9f530a3b0223a130290b71acbaafa
+file=b43/pcm5.fw.bz2
+md5=9df972fcdd49798f4dd51f443af9020c
+file=b43/ucode11.fw.bz2
+md5=8dc4d1fe3cb756c2859bdfb182bc6588
+file=b43/ucode13.fw.bz2
+md5=8b7694125e712f76455b79709f85f4e0
+file=b43/ucode14.fw.bz2
+md5=649ddfe4893d1a5db20ab30aa5f0c995
+file=b43/ucode15.fw.bz2
+md5=48ac682feff1371cdacb04e7f6e32933
+file=b43/ucode4.fw.bz2
+md5=8266a19ac6240b9ce4139ae3d5a1d8f8
+file=b43/ucode5.fw.bz2
+md5=3549bf06dfcd6d0625a4c62e82ee10b6
+file=b43/ucode9.fw.bz2
+md5=4736664492e6278f67d662b600309e3a  
+
+[Firmwares/WiFi/B43legacy]
+name=Broadcom BCM43xx (Apple AirPort ...) Legacy Firmware
+dir=iso/GEEXBOX/firmware/b43legacy/
+file=b43legacy/a0g0bsinitvals2.fw.bz2
+md5=fb11fe6e4213705607dfac2eb86a69fa
+file=b43legacy/a0g0bsinitvals5.fw.bz2
+md5=a4e2fdbbaf15cb5547f6d3ea5e6cf0eb
+file=b43legacy/a0g0initvals2.fw.bz2
+md5=20ec662afcf761ad1682181fa9532424
+file=b43legacy/a0g0initvals5.fw.bz2
+md5=1d42e785c889bffeefac8e4ffb0eb380
+file=b43legacy/a0g1bsinitvals5.fw.bz2
+md5=6c511a8bebffa80d055b864b4d7ba7cc
+file=b43legacy/a0g1initvals5.fw.bz2
+md5=9905e173a0df4e226d3c250013aeced4
+file=b43legacy/b0g0bsinitvals2.fw.bz2
+md5=9705a67e81b499f8e4aba327c1286ce3
+file=b43legacy/b0g0bsinitvals5.fw.bz2
+md5=5faaa8dd3d850c8f364d2d3397bc3f20
+file=b43legacy/b0g0initvals2.fw.bz2
+md5=dd2a9bd8662520d3d5fdefff2a82678f
+file=b43legacy/b0g0initvals5.fw.bz2
+md5=e75e692d76c633a0b60e9d31d10cff54
+file=b43legacy/pcm4.fw.bz2
+md5=57e9f530a3b0223a130290b71acbaafa
+file=b43legacy/pcm5.fw.bz2
+md5=9df972fcdd49798f4dd51f443af9020c
+file=b43legacy/ucode11.fw.bz2
+md5=110fc269346585cd13f84ed095876f38
+file=b43legacy/ucode2.fw.bz2
+md5=416674682840a5d7308668f1bae2b468
+file=b43legacy/ucode4.fw.bz2
+md5=a7f160dad21f4ee2c6dd7f7e4415bac4
+file=b43legacy/ucode5.fw.bz2
+md5=766d21d572b90e142f4856032d420ee8  
+
+[Firmwares/WiFi/IPW2100]
+name=Intel PRO/Wireless 2100 Firmware
+license=ipw/ipw2100-1.3/LICENSE
+file=ipw/ipw2100-1.3/ipw2100-1.3-i.fw.bz2
+md5=9fac3d40b2a836c11eda6e1ee88d8102
+file=ipw/ipw2100-1.3/ipw2100-1.3-p.fw.bz2
+md5=d98845daefb9fd0dba035c0b730fd3f6
+file=ipw/ipw2100-1.3/ipw2100-1.3.fw.bz2
+md5=1c84b3b29f8060b1c6f25f6d4fdfb88f
+
+[Firmwares/WiFi/IPW2200]
+name=Intel Pro/Wireless 2200BG Firmware
+license=ipw/ipw2200-3.0/LICENSE
+file=ipw/ipw2200-3.0/ipw2200-bss.fw.bz2
+md5=290b024ff8383483280857e006725920
+file=ipw/ipw2200-3.0/ipw2200-ibss.fw.bz2
+md5=1a57e5d2316ab2523003932717322512
+file=ipw/ipw2200-3.0/ipw2200-sniffer.fw.bz2
+md5=937b3d7bba05827c88d701d2942aea50
+
+[Firmwares/WiFi/IWL3945]
+name=Intel PRO/Wireless 3945ABG/BG Firmware
+license=iwlwifi/iwlwifi-3945-2.14.4/LICENSE
+file=iwlwifi/iwlwifi-3945-2.14.4/iwlwifi-3945-1.ucode.bz2
+md5=d2c8cfe9384b5e43ed9a9b48b6ccb499
+
+[Firmwares/WiFi/IWL4965]
+name=Intel Wireless WiFi 4965AGN Firmware
+license=iwlwifi/iwlwifi-4965-4.44.15/LICENSE
+file=iwlwifi/iwlwifi-4965-4.44.15/iwlwifi-4965-1.ucode.bz2
+md5=f67b2ba8cc2b630b39e0cba3dd65004f
+
+[Firmwares/WiFi/IWL4965-2]
+name=Intel Wireless WiFi 4965AGN Firmware
+license=iwlwifi/iwlwifi-4965-228.57.2.21/LICENSE
+file=iwlwifi/iwlwifi-4965-228.57.2.21/iwlwifi-4965-2.ucode.bz2
+md5=d5edbd34b3407937b7ce8d5aa9d36f7f
+
+[Firmwares/WiFi/IWL5000]
+name=Intel Wireless WiFi 5000 Firmware
+license=iwlwifi/iwlwifi-5000-5.4.A.11/LICENSE
+file=iwlwifi/iwlwifi-5000-5.4.A.11/iwlwifi-5000-1.ucode.bz2
+md5=2a039cf2bf175678c950b02ba3663810
+
+[Firmwares/WiFi/Prism54]
+name=Prism54 PCI Firmware driver
+file=prism54/p54pci_1.0.4.3.arm.bz2
+md5=a8e9382105ffddbb35c077e2809d041f
+rename=isl3890.bz2
+file=prism54/p54u_2.5.6.0.arm.bz2
+md5=bfb8a8ec51a200af64913be64d131dea
+rename=isl3890usb.bz2
+file=prism54/p54pci_1.1.0.0.arm.bz2
+md5=2dd1e17b8b8cecbb945ea903c4bd45f8
+rename=isl3877.bz2
+file=prism54/p54u_3887_2.5.8.0.arm.bz2
+md5=f5c81e6abbe4986b07fe0101814e184f
+rename=isl3887usb_bare.bz2
+file=prism54/isl3886.bz2
+md5=ec2c905b4d85ccd492716d1f09488fbd
+
+[Firmwares/WiFi/Atmel]
+name=Atmel Firmware driver
+file=atmel/atmel-firmware-1.3/atmel_at76c502_3com.bin.bz2
+md5=fce3442edcefdb875fb942768696a1c7
+file=atmel/atmel-firmware-1.3/atmel_at76c502_3com-wpa.bin.bz2
+md5=452dda5f3a79845e925376ce340be503
+file=atmel/atmel-firmware-1.3/atmel_at76c502.bin.bz2
+md5=d499f3d2a4494446c8f1afe6e4a3c76e
+file=atmel/atmel-firmware-1.3/atmel_at76c502d.bin.bz2
+md5=5a3361616e096107e20ea33d240b3d98
+file=atmel/atmel-firmware-1.3/atmel_at76c502d-wpa.bin.bz2
+md5=d87fdf076b844f9ad1b5449edaa50dc8
+file=atmel/atmel-firmware-1.3/atmel_at76c502e.bin.bz2
+md5=134e0bfd29b8a7b146fa992c1fe7fc97
+file=atmel/atmel-firmware-1.3/atmel_at76c502e-wpa.bin.bz2
+md5=1386657bc87d617b75479e1def179a8f
+file=atmel/atmel-firmware-1.3/atmel_at76c502-wpa.bin.bz2
+md5=62bb62a8a8039fb1f3dcd98b3bc4fab8
+file=atmel/atmel-firmware-1.3/atmel_at76c503-i3861.bin.bz2
+md5=fc5c30e79f703f0e21f8b850fb2f6f81
+file=atmel/atmel-firmware-1.3/atmel_at76c503-i3863.bin.bz2
+md5=cc40127d3e990061bcee382ef5b7645d
+file=atmel/atmel-firmware-1.3/atmel_at76c503-rfmd-0.90.2-140.bin.bz2
+md5=8c2be008510d36895da6546c0e645aa4
+file=atmel/atmel-firmware-1.3/atmel_at76c503-rfmd-acc.bin.bz2
+md5=22eea1bfcfabc1ec2d6d46630a0bc93d
+file=atmel/atmel-firmware-1.3/atmel_at76c503-rfmd.bin.bz2
+md5=ee73ba8503279a89ae1741279dc32b01
+file=atmel/atmel-firmware-1.3/atmel_at76c504_2958-wpa.bin.bz2
+md5=57053a49ecb9135ba37c704b892fe256
+file=atmel/atmel-firmware-1.3/atmel_at76c504a_2958-wpa.bin.bz2
+md5=a93edca6213430404e282f3400b0705d
+file=atmel/atmel-firmware-1.3/atmel_at76c504.bin.bz2
+md5=56fa79125e6766b8cf2a8d2bd53db165
+file=atmel/atmel-firmware-1.3/atmel_at76c504c-wpa.bin.bz2
+md5=c1958f4b9a2f99f6f43e257e0666a989
+file=atmel/atmel-firmware-1.3/atmel_at76c505a-rfmd2958.bin.bz2
+md5=f9a479159f1d6cfedab157fd7025a87a
+file=atmel/atmel-firmware-1.3/atmel_at76c505-rfmd2958.bin.bz2
+md5=54f111e6eeef9919f8f80879d9996af0
+file=atmel/atmel-firmware-1.3/atmel_at76c505-rfmd.bin.bz2
+md5=2b78d8525f4f7166b3814e5cb91a228e
+file=atmel/atmel-firmware-1.3/atmel_at76c506.bin.bz2
+md5=94f85dcf0fe2373a39d5a4135710421c
+file=atmel/atmel-firmware-1.3/atmel_at76c506-wpa.bin.bz2
+md5=3c9788635146ef960f1bc0913233780d
+
+[Firmwares/WiFi/ZD1201]
+name=ZyDAS ZD1201 Firmware driver
+file=zd1201/zd1201-ap.fw.bz2
+md5=dc240a34442b080a1193c492414f3b42
+file=zd1201/zd1201.fw.bz2
+md5=a3843e36e87cd0372f092887f34bfcb7
+
+[Firmwares/WiFi/ZD1211]
+name=ZyDAS ZD1211/ZD1211B USB Wireless Firmware driver
+dir=iso/GEEXBOX/firmware/zd1211/
+file=zd1211/zd1211b_ub.bz2
+md5=3d6759a000815640fd7871f745314b0f
+file=zd1211/zd1211b_uph.bz2
+md5=ab872779e6b0e67e722a6c8fc926e616
+file=zd1211/zd1211b_uphm.bz2
+md5=b38e8e1888ab04fa4be36e1772da5379
+file=zd1211/zd1211b_uphr.bz2
+md5=4566f2f0bb98f14a959f8757e4d1bd34
+file=zd1211/zd1211b_ur.bz2
+md5=e38fe7986202e170fa5d84eb88b670d9
+file=zd1211/zd1211_ub.bz2
+md5=a0a1a65e4706bf9fbca5b5b01f14b7fc
+file=zd1211/zd1211_uph.bz2
+md5=ab872779e6b0e67e722a6c8fc926e616
+file=zd1211/zd1211_uphm.bz2
+md5=7891ab06be8cc1c5642cf824d8d9a750
+file=zd1211/zd1211_uphr.bz2
+md5=4f6e8e27d3f1bf974eae37ad344363c6
+file=zd1211/zd1211_ur.bz2
+md5=e38fe7986202e170fa5d84eb88b670d9
+
+[Firmwares/WiFi/RT61]
+name=Ralink RT61 Wireless Firmware driver
+file=ralink/rt61/rt2561.bin.bz2
+md5=5e343be72659e5d6cb53d36611d1dd04
+file=ralink/rt61/rt2561s.bin.bz2
+md5=0a3ccd1b42f59cb1d1b706f28f0f87dc
+file=ralink/rt61/rt2661.bin.bz2
+md5=bf8ac3d9b78031d95adcd71d969c21e0
+
+[Firmwares/WiFi/RT73]
+name=Ralink RT73 Wireless Firmware driver
+file=ralink/rt73/rt73.bin.bz2
+md5=991656c35d5979a016e859d9e341499a
+
+[Firmwares/WiFi/Libertas]
+name=Marvell Libertas Wireless Firmware driver
+file=libertas/usb8388.bin.bz2
+md5=ea53ab6e289580b7a1ad962908a79dff
+
+[Firmwares/DVB/]
+name=Firmware for the DVB cards.
+file=DVB/
+
+[Firmwares/DVB/dvb-usb-a800]
+name=Firmware for the AVerMedia AVerTV DVB-T USB 2.0 card.
+file=dvb-usb-a800/dvb-usb-avertv-a800-02.fw.bz2
+md5=c29f6ca057792ebc29be0631203bdb58
+
+[Firmwares/DVB/dvb-usb-af9015]
+name=Firmware for AF9015 based DVB-T USB cards.
+file=dvb-usb-af9015/dvb-usb-af9015.fw.bz2
+md5=14fd2437b11ce49b956d7f6a6272a60d
+
+[Firmwares/DVB/dvb-usb-dib0700]
+name=Firmware for Avermedia USB 2.0/1.1 DVB-T devices.
+file=dvb-usb-dib0700/dvb-usb-dib0700-01.fw.bz2
+md5=97dd85d9e1252dc0ca4acf6123b82878
+
+[Firmwares/DVB/dvb-usb-dibusb-mb]
+name=Firmware for DIBcom USB 1.1 DVB-T devices.
+file=dvb-usb-dibusb-mb/dvb-usb-dibusb-5.0.0.11.fw.bz2
+md5=152373433e4178d128ec00575d2f8777
+
+[Firmwares/DVB/dvb-usb-dibusb-mc]
+name=Firmware for the Artec T1 USB2.0 DVB-T USB device.
+file=dvb-usb-dibusb-mc/dvb-usb-dibusb-6.0.0.8.fw.bz2
+md5=ac5e2cef27c08f53f0d816626bfe1bd3
+
+[Firmwares/DVB/dvb-usb-dtt200u/]
+name=Firmwares for the WideView/Yakumo/Hama/Typhoon/Yuan Boxes and Pens.
+
+[Firmwares/DVB/dvb-usb-dtt200u/dtt200u]
+name=Firmware for the WideView/Yuan/Yakumo/Hama/Typhoon DVB-T USB2.0 (WT-200U)
+file=dvb-usb-dtt200u/dvb-usb-dtt200u-01.fw.bz2
+md5=87a6b8fd649b6ae7f8790530ffde36c1
+
+[Firmwares/DVB/dvb-usb-dtt200u/wt220u]
+name=Firmware for the WideView WT-220U PenType Receiver (and clones)
+file=dvb-usb-dtt200u/dvb-usb-wt220u-01.fw.bz2
+md5=c9e2fc2e3bdc62ca52f5c98f9aac4e84
+file=dvb-usb-dtt200u/dvb-usb-wt220u-02.fw.bz2
+md5=d9cdf42135b94baca6d60907ecdf3381
+file=dvb-usb-dtt200u/dvb-usb-wt220u-fc03.fw.bz2
+md5=a179296f9ae8573226011ce4e3a5e15d
+file=dvb-usb-dtt200u/dvb-usb-wt220u-zl0353-01.fw.bz2
+md5=09e258af2a194924958668dfd77f6b60
+
+[Firmwares/DVB/dvb-usb-tvwalkert]
+name=Firmware for the TV Walkert
+file=dvb-usb-tvwalkert/dvb-usb-tvwalkert.fw.bz2
+md5=8f10e058efd0466a686df00c08c81df8
+
+[Firmwares/DVB/cx24166]
+name=Firmware for the frontend of Hauppauge WinTV Nova DVB-S2 HD
+file=cx24166/dvb-fe-cx24166.fw.bz2
+md5=3628b8d127ef32df2e77553cd5a9b470
+
+[Firmwares/DVB/cxusb-bluebird]
+name=Firmware for the frontend of some DViCO FusionHDTV (Bluebird) USB2.0 cards.
+file=cxusb-bluebird/dvb-usb-bluebird-01.fw.bz2
+md5=c7dfeffc8e479dad1bffa09840c5522d
+
+[Firmwares/DVB/nxt200x]
+name=Firmware for the frontend of some Technisat/B2C2 Sky/Air/Cable2PC USB
+file=nxt2002/dvb-fe-nxt2002.fw.bz2
+md5=9da8860dfa3d379cc84ee6b40eb167da
+file=nxt2004/dvb-fe-nxt2004.fw.bz2
+md5=d4667fb7f1b8ae7fba0b8749ed6a6908
+
+[Firmwares/DVB/or51132]
+name=Firmware for the OREN 51132 demodulators.
+file=or51132/dvb-fe-or51132-qam.fw.bz2
+md5=0948363fcd00f989346fc6d6723710d4
+file=or51132/dvb-fe-or51132-vsb.fw.bz2
+md5=4bc3a4973974f13323fc50158c6d69c8
+
+[Firmwares/DVB/or51211]
+name=Firmware for OREN or51211 demodulators.
+file=or51211/dvb-fe-or51211.fw.bz2
+md5=897b9ed4f2c52f68a8a3f2a5f82820fa
+
+[Firmwares/DVB/sp8870]
+name=Firmware for the SP8870 based demodulators.
+file=sp8870/dvb-fe-sp8870.fw.bz2
+md5=7eb13762632f6d15e304f5f6383d6408
+
+[Firmwares/DVB/sp887x]
+name=Firmware for the SP887x based demodulators.
+file=sp887x/dvb-fe-sp887x.fw.bz2
+md5=3159053213c98893fc10517c362354ca
+
+[Firmwares/DVB/tda1004x/]
+name=Firmware for the Philips TDA10045H/TDA10046H based cards
+
+[Firmwares/DVB/tda1004x/TDA10045H]
+name=Firmware for the Philips TDA10045H based card
+file=tda1004x/dvb-fe-tda10045.fw.bz2
+md5=64040708bbd6a0dff0b76fcdbaa645b1
+
+[Firmwares/DVB/tda1004x/TDA10046H]
+name=Firmware for the Philips TDA10046H based card
+file=tda1004x/dvb-fe-tda10046.fw.bz2
+md5=fce4dcf2915d28f5bd8e52df37175edb
+
+[Firmwares/DVB/ttpci]
+name=Firmware for the AV7110 based DVB cards.
+file=ttpci/2624/dvb-ttpci-01.fw.bz2
+md5=48b5d84491fe631167131e464ac25791
+
+[Firmwares/DVB/ttusb_dec/]
+name=Firmware for the Technotrend DEC Budget USB1.1 (DVB-S/T) based cards.
+
+[Firmwares/DVB/ttusb_dec/DEC2000-t]
+name=Firmware for the Technotrend DEC Budget USB1.1 DEC2000-T
+file=ttusb_dec/dvb-ttusb-dec-2000t.fw.bz2
+md5=aa2741d99341331c444af2beea34b158
+
+[Firmwares/DVB/ttusb_dec/DEC2540-t]
+name=Firmware for the Technotrend DEC Budget USB1.1 DEC2540-T
+file=ttusb_dec/dvb-ttusb-dec-2540t.fw.bz2
+md5=5bdd31c517e667ec047f13f59947c047
+
+[Firmwares/DVB/ttusb_dec/DEC3000-s]
+name=Firmware for the Technotrend DEC Budget USB1.1 DEC3000-S
+file=ttusb_dec/dvb-ttusb-dec-3000s.fw.bz2
+md5=fdf8ec99c55301b04e5ad586c957540d
+
+[Firmwares/DVB/umt-010]
+name=Firmware for the HanfTek UMT-010 card.
+file=umt-010/dvb-usb-umt-010-02.fw.bz2
+md5=49979c657355e8ff3158d7ac39d9273f
+
+[Firmwares/DVB/vp702x]
+name=Firmware for the TwinhanDTV StarBox - DVB-S based cards.
+file=vp702x/dvb-usb-vp702x-01.fw.bz2
+md5=fde23b38e662c2ebe8f8e090338d4c94
+
+[Firmwares/DVB/vp7045]
+name=Firmware for the Twinhan DVB-T USB2.0 based cards.
+file=vp7045/dvb-usb-vp7045-01.fw.bz2
+md5=3c73a3f380ec08b845e5c11a286fe1d3
+
+[Firmwares/DVB/xc3028]
+name=Firmware for the Xceive CX3028 based cards.
+file=xc3028/xc3028-v27.fw.bz2
+md5=19212d8c1b1107a0aa3657a6812cf09b
+name=Firmware for the (low power) Xceive CX3028 based cards.
+file=xc3028/xc3028L-v36.fw.bz2
+md5=281ee4c00b4f2722cb484b8b5b94a545  
+
+[Firmwares/IVTV]
+name=Firmware for the IVTV based cards.
+license=IVTV/license-end-user.txt
+desc=Firmware for the Hauppauge PVR 150/250/350/500 and clones.
+file=IVTV/v4l-cx2341x-dec.fw.bz2
+md5=f25e62f2c62881c35968fda333abe3df
+file=IVTV/v4l-cx2341x-enc.fw.bz2
+md5=815e717a37690dbbd6ae53719a881ae8
+file=IVTV/v4l-cx2341x-init.mpg.bz2
+md5=3b7dec419b8dbe79bc372e7ea73f0efd
+file=IVTV/v4l-cx25840.fw.bz2
+md5=22350986a9f5565929878b31e5b32dc2
+file=IVTV/v4l-pvrusb2-24xxx-01.fw.bz2
+md5=11ba243bf699adc66e94a5cb687bbbff
+file=IVTV/v4l-pvrusb2-29xxx-01.fw.bz2
+md5=9848b63056b4d188d1c42e9376fc8a6e
+file=IVTV/cx18/v4l-cx23418-apu.fw.bz2
+md5=e11466b163fa107f255fa195281c8db8  
+file=IVTV/cx18/v4l-cx23418-cpu.fw.bz2
+md5=5b064cc2d61c357e26ed3c9f378df8c0
+file=IVTV/cx18/v4l-cx23418-dig.fw.bz2  
+md5=b6c11eb3e324fd6be43ed47351529bb3
+
+[Firmwares/Bluetooth/]
+name=Firmwares for the bluetooth based cards.
+file=Bluetooth/
+
+[Firmwares/Bluetooth/BCM2033]
+name=Firmware for the BCM2033 based cards.
+file=BCM2033/BCM2033-FW.bin.bz2
+md5=bf2a579fb53f869a6803b2957727a14e
+file=BCM2033/BCM2033-MD.hex.bz2
+md5=a554dfd2091cf4d5c2f5f2ef3f34007f
+
+[Firmwares/Bluetooth/STLC2500]
+name=Firmware for the STLC2500 based cards.
+file=STLC2500/STLC2500_R4_00_03.ptc.bz2
+md5=b81dcf5ac05793dee046daa76de9db8a
+file=STLC2500/STLC2500_R4_00_06.ssf.bz2
+md5=6f9abbabeb1cc9982f5a69eedb669920
+file=STLC2500/STLC2500_R4_02_02_WLAN.ssf.bz2
+md5=a133f27a9c678ff4bd9c714cb15e782c
+file=STLC2500/STLC2500_R4_02_04.ptc.bz2
+md5=529a55b5a12463de5bf1b18c1337c94f
diff --git a/packages/network/extra-firmwares-nonfree/install b/packages/network/extra-firmwares-nonfree/install
new file mode 100755
index 0000000000..0dec5530e4
--- /dev/null
+++ b/packages/network/extra-firmwares-nonfree/install
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+. config/options
+
+mkdir -p $INSTALL/firmware
+cp -PR $BUILD/$1*/* $INSTALL/firmware
+
+mkdir -p $INSTALL/firmware/zd1211
+mv $INSTALL/firmware/zd1211_* $INSTALL/firmware/zd1211
+mv $INSTALL/firmware/zd1211b_* $INSTALL/firmware/zd1211
diff --git a/packages/network/extra-firmwares-nonfree/unpack b/packages/network/extra-firmwares-nonfree/unpack
new file mode 100755
index 0000000000..789aefd9f3
--- /dev/null
+++ b/packages/network/extra-firmwares-nonfree/unpack
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+. config/options
+
+mkdir -p $BUILD/$1
+$SCRIPTS/extract $1 "*" $BUILD/$1
+
+# Rename firmwares that need to be
+mv $BUILD/$1/p54pci_1.0.4.3.arm.bz2 $BUILD/$1/isl3890.bz2
+mv $BUILD/$1/p54u_2.5.6.0.arm.bz2 $BUILD/$1/isl3890usb.bz2
+mv $BUILD/$1/p54pci_1.1.0.0.arm.bz2 $BUILD/$1/isl3877.bz2
+mv $BUILD/$1/p54u_3887_2.5.8.0.arm.bz2 $BUILD/$1/isl3887usb_bare.bz2
+
+# Move firmwares to their belonging path
+mkdir -p $BUILD/$1/acx/default
+mv $BUILD/$1/tiacx* $BUILD/$1/acx/default/
+
+# Extract firmware archives that need to be
+[ -f $BUILD/$1/b43.tar ] && tar xvf $BUILD/$1/b43.tar
+[ -f $BUILD/$1/b43legacy.tar ] && tar xvf $BUILD/$1/b43legacy.tar
+
+# Uncompress firmwares
+bunzip2 -f $BUILD/$1/*.bz2
+bunzip2 -f $BUILD/$1/b43/*.bz2
+bunzip2 -f $BUILD/$1/b43legacy/*.bz2
diff --git a/packages/network/extra-firmwares-nonfree/url b/packages/network/extra-firmwares-nonfree/url
new file mode 100644
index 0000000000..954d0cc474
--- /dev/null
+++ b/packages/network/extra-firmwares-nonfree/url
@@ -0,0 +1,110 @@
+http://www.geexbox.org/firmwares/WiFi/b43.tar
+http://www.geexbox.org/firmwares/WiFi/b43legacy.tar
+http://www.geexbox.org/firmwares/WiFi/acx/default/tiacx100
+http://www.geexbox.org/firmwares/WiFi/acx/default/tiacx100r0D
+http://www.geexbox.org/firmwares/WiFi/acx/default/tiacx100r11
+http://www.geexbox.org/firmwares/WiFi/acx/default/tiacx100r15
+http://www.geexbox.org/firmwares/WiFi/acx/default/tiacx100usb
+http://www.geexbox.org/firmwares/WiFi/acx/default/tiacx111c16
+http://www.geexbox.org/firmwares/WiFi/acx/default/tiacx111c17
+http://www.geexbox.org/firmwares/WiFi/acx/default/tiacx111c19
+http://www.geexbox.org/firmwares/WiFi/atmel/atmel-firmware-1.3/atmel_at76c502_3com.bin.bz2
+http://www.geexbox.org/firmwares/WiFi/atmel/atmel-firmware-1.3/atmel_at76c502_3com-wpa.bin.bz2
+http://www.geexbox.org/firmwares/WiFi/atmel/atmel-firmware-1.3/atmel_at76c502.bin.bz2
+http://www.geexbox.org/firmwares/WiFi/atmel/atmel-firmware-1.3/atmel_at76c502d.bin.bz2
+http://www.geexbox.org/firmwares/WiFi/atmel/atmel-firmware-1.3/atmel_at76c502d-wpa.bin.bz2
+http://www.geexbox.org/firmwares/WiFi/atmel/atmel-firmware-1.3/atmel_at76c502e.bin.bz2
+http://www.geexbox.org/firmwares/WiFi/atmel/atmel-firmware-1.3/atmel_at76c502e-wpa.bin.bz2
+http://www.geexbox.org/firmwares/WiFi/atmel/atmel-firmware-1.3/atmel_at76c502-wpa.bin.bz2
+http://www.geexbox.org/firmwares/WiFi/atmel/atmel-firmware-1.3/atmel_at76c504_2958-wpa.bin.bz2
+http://www.geexbox.org/firmwares/WiFi/atmel/atmel-firmware-1.3/atmel_at76c504a_2958-wpa.bin.bz2
+http://www.geexbox.org/firmwares/WiFi/atmel/atmel-firmware-1.3/atmel_at76c504.bin.bz2
+http://www.geexbox.org/firmwares/WiFi/atmel/atmel-firmware-1.3/atmel_at76c504c-wpa.bin.bz2
+http://www.geexbox.org/firmwares/WiFi/atmel/atmel-firmware-1.3/atmel_at76c506.bin.bz2
+http://www.geexbox.org/firmwares/WiFi/atmel/atmel-firmware-1.3/atmel_at76c506-wpa.bin.bz2
+http://www.geexbox.org/firmwares/WiFi/atmel/atmel-firmware-1.3/atmel_at76c503-i3861.bin.bz2
+http://www.geexbox.org/firmwares/WiFi/atmel/atmel-firmware-1.3/atmel_at76c503-i3863.bin.bz2
+http://www.geexbox.org/firmwares/WiFi/atmel/atmel-firmware-1.3/atmel_at76c503-rfmd-0.90.2-140.bin.bz2
+http://www.geexbox.org/firmwares/WiFi/atmel/atmel-firmware-1.3/atmel_at76c503-rfmd-acc.bin.bz2
+http://www.geexbox.org/firmwares/WiFi/atmel/atmel-firmware-1.3/atmel_at76c503-rfmd.bin.bz2
+http://www.geexbox.org/firmwares/WiFi/atmel/atmel-firmware-1.3/atmel_at76c505a-rfmd2958.bin.bz2
+http://www.geexbox.org/firmwares/WiFi/atmel/atmel-firmware-1.3/atmel_at76c505-rfmd2958.bin.bz2
+http://www.geexbox.org/firmwares/WiFi/atmel/atmel-firmware-1.3/atmel_at76c505-rfmd.bin.bz2
+http://www.geexbox.org/firmwares/WiFi/ipw/ipw2100-1.3/ipw2100-1.3-i.fw.bz2
+http://www.geexbox.org/firmwares/WiFi/ipw/ipw2100-1.3/ipw2100-1.3-p.fw.bz2
+http://www.geexbox.org/firmwares/WiFi/ipw/ipw2100-1.3/ipw2100-1.3.fw.bz2
+http://www.geexbox.org/firmwares/WiFi/ipw/ipw2200-3.0/ipw2200-bss.fw.bz2
+http://www.geexbox.org/firmwares/WiFi/ipw/ipw2200-3.0/ipw2200-ibss.fw.bz2 
+http://www.geexbox.org/firmwares/WiFi/ipw/ipw2200-3.0/ipw2200-sniffer.fw.bz2
+http://www.geexbox.org/firmwares/WiFi/iwlwifi/iwlwifi-3945-2.14.4/iwlwifi-3945-1.ucode.bz2
+http://www.geexbox.org/firmwares/WiFi/iwlwifi/iwlwifi-4965-4.44.15/iwlwifi-4965-1.ucode.bz2
+http://www.geexbox.org/firmwares/WiFi/iwlwifi/iwlwifi-4965-228.57.2.21/iwlwifi-4965-2.ucode.bz2
+http://www.geexbox.org/firmwares/WiFi/iwlwifi/iwlwifi-5000-5.4.A.11/iwlwifi-5000-1.ucode.bz2
+http://www.geexbox.org/firmwares/WiFi/prism54/isl3886.bz2
+http://www.geexbox.org/firmwares/WiFi/prism54/p54pci_1.0.4.3.arm.bz2
+http://www.geexbox.org/firmwares/WiFi/prism54/p54pci_1.1.0.0.arm.bz2
+http://www.geexbox.org/firmwares/WiFi/prism54/p54u_2.5.6.0.arm.bz2
+http://www.geexbox.org/firmwares/WiFi/prism54/p54u_3887_2.5.8.0.arm.bz2
+http://www.geexbox.org/firmwares/WiFi/ralink/rt61/rt2561.bin.bz2
+http://www.geexbox.org/firmwares/WiFi/ralink/rt61/rt2561s.bin.bz2
+http://www.geexbox.org/firmwares/WiFi/ralink/rt61/rt2661.bin.bz2
+http://www.geexbox.org/firmwares/WiFi/ralink/rt73/rt73.bin.bz2
+http://www.geexbox.org/firmwares/WiFi/libertas/usb8388.bin.bz2
+http://www.geexbox.org/firmwares/WiFi/zd1201/zd1201-ap.fw.bz2
+http://www.geexbox.org/firmwares/WiFi/zd1201/zd1201.fw.bz2
+http://www.geexbox.org/firmwares/WiFi/zd1211/zd1211b_ub.bz2
+http://www.geexbox.org/firmwares/WiFi/zd1211/zd1211b_uph.bz2
+http://www.geexbox.org/firmwares/WiFi/zd1211/zd1211b_uphm.bz2
+http://www.geexbox.org/firmwares/WiFi/zd1211/zd1211b_uphr.bz2
+http://www.geexbox.org/firmwares/WiFi/zd1211/zd1211b_ur.bz2
+http://www.geexbox.org/firmwares/WiFi/zd1211/zd1211_ub.bz2
+http://www.geexbox.org/firmwares/WiFi/zd1211/zd1211_uph.bz2
+http://www.geexbox.org/firmwares/WiFi/zd1211/zd1211_uphm.bz2
+http://www.geexbox.org/firmwares/WiFi/zd1211/zd1211_uphr.bz2
+http://www.geexbox.org/firmwares/WiFi/zd1211/zd1211_ur.bz2
+http://www.geexbox.org/firmwares/DVB/dvb-usb-a800/dvb-usb-avertv-a800-02.fw.bz2
+http://www.geexbox.org/firmwares/DVB/dvb-usb-af9015/dvb-usb-af9015.fw.bz2
+http://www.geexbox.org/firmwares/DVB/dvb-usb-dib0700/dvb-usb-dib0700-01.fw.bz2
+http://www.geexbox.org/firmwares/DVB/dvb-usb-dibusb-mb/dvb-usb-dibusb-5.0.0.11.fw.bz2
+http://www.geexbox.org/firmwares/DVB/dvb-usb-dibusb-mc/dvb-usb-dibusb-6.0.0.8.fw.bz2
+http://www.geexbox.org/firmwares/DVB/dvb-usb-dtt200u/dvb-usb-dtt200u-01.fw.bz2
+http://www.geexbox.org/firmwares/DVB/dvb-usb-dtt200u/dvb-usb-wt220u-01.fw.bz2
+http://www.geexbox.org/firmwares/DVB/dvb-usb-dtt200u/dvb-usb-wt220u-02.fw.bz2
+http://www.geexbox.org/firmwares/DVB/dvb-usb-dtt200u/dvb-usb-wt220u-fc03.fw.bz2
+http://www.geexbox.org/firmwares/DVB/dvb-usb-dtt200u/dvb-usb-wt220u-zl0353-01.fw.bz2
+http://www.geexbox.org/firmwares/DVB/dvb-usb-tvwalkert/dvb-usb-tvwalkert.fw.bz2
+http://www.geexbox.org/firmwares/DVB/cx24116/dvb-fe-cx24116.fw.bz2
+http://www.geexbox.org/firmwares/DVB/xc3028/xc3028-v27.fw.bz2
+http://www.geexbox.org/firmwares/DVB/xc3028/xc3028L-v36.fw.bz2
+http://www.geexbox.org/firmwares/DVB/cxusb-bluebird/dvb-usb-bluebird-01.fw.bz2
+http://www.geexbox.org/firmwares/DVB/nxt2002/dvb-fe-nxt2002.fw.bz2
+http://www.geexbox.org/firmwares/DVB/nxt2004/dvb-fe-nxt2004.fw.bz2
+http://www.geexbox.org/firmwares/DVB/or51132/dvb-fe-or51132-qam.fw.bz2
+http://www.geexbox.org/firmwares/DVB/or51132/dvb-fe-or51132-vsb.fw.bz2
+http://www.geexbox.org/firmwares/DVB/or51211/dvb-fe-or51211.fw.bz2
+http://www.geexbox.org/firmwares/DVB/sp8870/dvb-fe-sp8870.fw.bz2
+http://www.geexbox.org/firmwares/DVB/sp887x/dvb-fe-sp887x.fw.bz2
+http://www.geexbox.org/firmwares/DVB/tda1004x/dvb-fe-tda10045.fw.bz2
+http://www.geexbox.org/firmwares/DVB/tda1004x/dvb-fe-tda10046.fw.bz2
+http://www.geexbox.org/firmwares/DVB/ttpci/2624/dvb-ttpci-01.fw.bz2
+http://www.geexbox.org/firmwares/DVB/ttusb_dec/dvb-ttusb-dec-2000t.fw.bz2
+http://www.geexbox.org/firmwares/DVB/ttusb_dec/dvb-ttusb-dec-2540t.fw.bz2
+http://www.geexbox.org/firmwares/DVB/ttusb_dec/dvb-ttusb-dec-3000s.fw.bz2
+http://www.geexbox.org/firmwares/DVB/umt-010/dvb-usb-umt-010-02.fw.bz2
+http://www.geexbox.org/firmwares/DVB/vp702x/dvb-usb-vp702x-01.fw.bz2
+http://www.geexbox.org/firmwares/DVB/vp7045/dvb-usb-vp7045-01.fw.bz2
+http://www.geexbox.org/firmwares/IVTV/v4l-cx2341x-dec.fw.bz2
+http://www.geexbox.org/firmwares/IVTV/v4l-cx2341x-enc.fw.bz2
+http://www.geexbox.org/firmwares/IVTV/v4l-cx2341x-init.mpg.bz2
+http://www.geexbox.org/firmwares/IVTV/v4l-cx25840.fw.bz2
+http://www.geexbox.org/firmwares/IVTV/v4l-pvrusb2-24xxx-01.fw.bz2
+http://www.geexbox.org/firmwares/IVTV/v4l-pvrusb2-29xxx-01.fw.bz2
+http://www.geexbox.org/firmwares/IVTV/cx18/v4l-cx23418-apu.fw.bz2
+http://www.geexbox.org/firmwares/IVTV/cx18/v4l-cx23418-cpu.fw.bz2
+http://www.geexbox.org/firmwares/IVTV/cx18/v4l-cx23418-dig.fw.bz2
+http://www.geexbox.org/firmwares/Bluetooth/BCM2033/BCM2033-FW.bin.bz2
+http://www.geexbox.org/firmwares/Bluetooth/BCM2033/BCM2033-MD.hex.bz2
+http://www.geexbox.org/firmwares/Bluetooth/STLC2500/STLC2500_R4_00_03.ptc.bz2
+http://www.geexbox.org/firmwares/Bluetooth/STLC2500/STLC2500_R4_00_06.ssf.bz2
+http://www.geexbox.org/firmwares/Bluetooth/STLC2500/STLC2500_R4_02_02_WLAN.ssf.bz2
+http://www.geexbox.org/firmwares/Bluetooth/STLC2500/STLC2500_R4_02_04.ptc.bz2