diff --git a/config/kernel/kernel.config.i586-ipfire b/config/kernel/kernel.config.i586-ipfire
index 4295eb412..78de471da 100644
--- a/config/kernel/kernel.config.i586-ipfire
+++ b/config/kernel/kernel.config.i586-ipfire
@@ -4006,7 +4006,8 @@ CONFIG_USBIP_HOST=m
 # CONFIG_POHMELFS is not set
 CONFIG_IDE_PHISON=m
 # CONFIG_LINE6_USB is not set
-# CONFIG_DRM_NOUVEAU is not set
+CONFIG_DRM_NOUVEAU=m
+CONFIG_DRM_NOUVEAU_BACKLIGHT=y
 
 #
 # I2C encoder or helper chips
diff --git a/config/rootfiles/common/apache2 b/config/rootfiles/common/apache2
index 01e9bbe4c..802ddcb72 100644
--- a/config/rootfiles/common/apache2
+++ b/config/rootfiles/common/apache2
@@ -439,6 +439,7 @@ etc/httpd/conf/mime.types
 #srv/web/ipfire/manual/images/mod_rewrite_fig2.gif
 #srv/web/ipfire/manual/images/mod_rewrite_fig2.png
 #srv/web/ipfire/manual/images/pixel.gif
+#srv/web/ipfire/manual/images/rewrite_backreferences.png
 #srv/web/ipfire/manual/images/rewrite_rule_flow.png
 #srv/web/ipfire/manual/images/right.gif
 #srv/web/ipfire/manual/images/ssl_intro_fig1.gif
@@ -1051,6 +1052,7 @@ etc/httpd/conf/mime.types
 #srv/web/ipfire/manual/style/css/manual-zip-100pc.css
 #srv/web/ipfire/manual/style/css/manual-zip.css
 #srv/web/ipfire/manual/style/css/manual.css
+#srv/web/ipfire/manual/style/css/prettify.css
 #srv/web/ipfire/manual/style/faq.dtd
 #srv/web/ipfire/manual/style/lang
 #srv/web/ipfire/manual/style/lang.dtd
@@ -1058,6 +1060,8 @@ etc/httpd/conf/mime.types
 #srv/web/ipfire/manual/style/latex/atbeginend.sty
 #srv/web/ipfire/manual/style/manualpage.dtd
 #srv/web/ipfire/manual/style/modulesynopsis.dtd
+#srv/web/ipfire/manual/style/scripts
+#srv/web/ipfire/manual/style/scripts/prettify.js
 #srv/web/ipfire/manual/style/sitemap.dtd
 #srv/web/ipfire/manual/style/version.ent
 #srv/web/ipfire/manual/style/xsl
@@ -1326,7 +1330,7 @@ usr/lib/apr-util-1/apr_dbd_sqlite3.so
 #usr/lib/libapr-1.la
 usr/lib/libapr-1.so
 usr/lib/libapr-1.so.0
-usr/lib/libapr-1.so.0.4.5
+usr/lib/libapr-1.so.0.4.6
 #usr/lib/libaprutil-1.a
 #usr/lib/libaprutil-1.la
 usr/lib/libaprutil-1.so
@@ -1349,17 +1353,17 @@ usr/sbin/httpd
 #usr/sbin/httxt2dbm
 #usr/sbin/logresolve
 #usr/sbin/rotatelogs
-#usr/share/man/man1/ab.1
-#usr/share/man/man1/apxs.1
 #usr/share/man/man1/dbmmanage.1
 #usr/share/man/man1/htdbm.1
 #usr/share/man/man1/htdigest.1
 #usr/share/man/man1/htpasswd.1
 #usr/share/man/man1/httxt2dbm.1
-#usr/share/man/man1/logresolve.1
+#usr/share/man/man8/ab.8
 #usr/share/man/man8/apachectl.8
+#usr/share/man/man8/apxs.8
 #usr/share/man/man8/htcacheclean.8
 #usr/share/man/man8/httpd.8
+#usr/share/man/man8/logresolve.8
 #usr/share/man/man8/rotatelogs.8
 #usr/share/man/man8/suexec.8
 var/log/httpd
diff --git a/config/rootfiles/common/dhcp b/config/rootfiles/common/dhcp
index c2f5aed05..381309c27 100644
--- a/config/rootfiles/common/dhcp
+++ b/config/rootfiles/common/dhcp
@@ -1,5 +1,6 @@
-#etc/dhclient.conf
-etc/dhcpd.conf
+#etc/dhcp
+#etc/dhcp/dhclient.conf
+etc/dhcp/dhcpd.conf
 #usr/bin/omshell
 #usr/include/dhcpctl
 #usr/include/dhcpctl/dhcpctl.h
diff --git a/config/rootfiles/common/fw_ath9k_htc b/config/rootfiles/common/fw_ath9k_htc
deleted file mode 100644
index a841a113e..000000000
--- a/config/rootfiles/common/fw_ath9k_htc
+++ /dev/null
@@ -1,2 +0,0 @@
-lib/firmware/htc_7010.fw
-lib/firmware/htc_9271.fw
diff --git a/config/rootfiles/common/linux-firmware b/config/rootfiles/common/linux-firmware
index d4b907106..78bcc64d3 100644
--- a/config/rootfiles/common/linux-firmware
+++ b/config/rootfiles/common/linux-firmware
@@ -3,10 +3,12 @@ lib/firmware/3com/3C359.bin
 lib/firmware/3com/typhoon.bin
 lib/firmware/GPL-3
 lib/firmware/LICENCE.Marvell
+lib/firmware/LICENCE.OLPC
 lib/firmware/LICENCE.agere
 lib/firmware/LICENCE.atheros_firmware
 lib/firmware/LICENCE.broadcom_bcm43xx
 lib/firmware/LICENCE.chelsio_firmware
+lib/firmware/LICENCE.ene_firmware
 lib/firmware/LICENCE.i2400m
 lib/firmware/LICENCE.iwlwifi_firmware
 lib/firmware/LICENCE.mwl8335
@@ -21,7 +23,9 @@ lib/firmware/LICENCE.ueagle-atm4-firmware
 lib/firmware/LICENCE.via_vt6656
 lib/firmware/LICENCE.xc5000
 lib/firmware/LICENSE.dib0700
-lib/firmware/LICENSE.radeon_rlc
+lib/firmware/LICENSE.radeon
+#lib/firmware/Makefile
+lib/firmware/README
 #lib/firmware/RTL8192E
 lib/firmware/RTL8192E/boot.img
 lib/firmware/RTL8192E/data.img
@@ -47,6 +51,9 @@ lib/firmware/agere_sta_fw.bin
 lib/firmware/ar3k/1020200/PS_ASIC.pst
 lib/firmware/ar3k/1020200/RamPatch.txt
 lib/firmware/ar3k/1020200/ar3kbdaddr.pst
+#lib/firmware/ar3k/1020201
+lib/firmware/ar3k/1020201/PS_ASIC.pst
+lib/firmware/ar3k/1020201/RamPatch.txt
 #lib/firmware/ar3k/30000
 lib/firmware/ar3k/30000/PS_ASIC.pst
 lib/firmware/ar3k/30000/RamPatch.txt
@@ -55,11 +62,24 @@ lib/firmware/ar3k/30000/ar3kbdaddr.pst
 lib/firmware/ar3k/30101/PS_ASIC.pst
 lib/firmware/ar3k/30101/RamPatch.txt
 lib/firmware/ar3k/30101/ar3kbdaddr.pst
+#lib/firmware/ar3k/30101coex
+lib/firmware/ar3k/30101coex/PS_ASIC.pst
+lib/firmware/ar3k/30101coex/PS_ASIC_aclHighPri.pst
+lib/firmware/ar3k/30101coex/PS_ASIC_aclLowPri.pst
+lib/firmware/ar3k/30101coex/RamPatch.txt
+lib/firmware/ar3k/30101coex/ar3kbdaddr.pst
 lib/firmware/ar3k/AthrBT_0x01020001.dfu
 lib/firmware/ar3k/AthrBT_0x01020200.dfu
+lib/firmware/ar3k/AthrBT_0x01020201.dfu
+lib/firmware/ar3k/AthrBT_0x11020000.dfu
+lib/firmware/ar3k/AthrBT_0x31010000.dfu
 lib/firmware/ar3k/ramps_0x01020001_26.dfu
 lib/firmware/ar3k/ramps_0x01020200_26.dfu
 lib/firmware/ar3k/ramps_0x01020200_40.dfu
+lib/firmware/ar3k/ramps_0x01020201_26.dfu
+lib/firmware/ar3k/ramps_0x01020201_40.dfu
+lib/firmware/ar3k/ramps_0x11020000_40.dfu
+lib/firmware/ar3k/ramps_0x31010000_40.dfu
 lib/firmware/ar7010.fw
 lib/firmware/ar7010_1_1.fw
 lib/firmware/ar9170-1.fw
@@ -73,6 +93,15 @@ lib/firmware/ath6k/AR6002/data.patch.hw2_0.bin
 lib/firmware/ath6k/AR6002/eeprom.bin
 lib/firmware/ath6k/AR6002/eeprom.data
 #lib/firmware/ath6k/AR6003
+#lib/firmware/ath6k/AR6003.1
+#lib/firmware/ath6k/AR6003.1/hw2.1.1
+lib/firmware/ath6k/AR6003.1/hw2.1.1/athwlan.bin
+lib/firmware/ath6k/AR6003.1/hw2.1.1/bdata.SD31.bin
+lib/firmware/ath6k/AR6003.1/hw2.1.1/bdata.SD32.bin
+lib/firmware/ath6k/AR6003.1/hw2.1.1/bdata.WB31.bin
+lib/firmware/ath6k/AR6003.1/hw2.1.1/data.patch.bin
+lib/firmware/ath6k/AR6003.1/hw2.1.1/endpointping.bin
+lib/firmware/ath6k/AR6003.1/hw2.1.1/otp.bin
 #lib/firmware/ath6k/AR6003/hw1.0
 lib/firmware/ath6k/AR6003/hw1.0/athwlan.bin.z77
 lib/firmware/ath6k/AR6003/hw1.0/bdata.SD31.bin
@@ -94,9 +123,20 @@ lib/firmware/ath6k/AR6003/hw2.1.1/bdata.SD32.bin
 lib/firmware/ath6k/AR6003/hw2.1.1/bdata.WB31.bin
 lib/firmware/ath6k/AR6003/hw2.1.1/data.patch.bin
 lib/firmware/ath6k/AR6003/hw2.1.1/endpointping.bin
+lib/firmware/ath6k/AR6003/hw2.1.1/fw-2.bin
+lib/firmware/ath6k/AR6003/hw2.1.1/fw-3.bin
 lib/firmware/ath6k/AR6003/hw2.1.1/otp.bin
+#lib/firmware/ath6k/AR6004
+#lib/firmware/ath6k/AR6004/hw1.2
+lib/firmware/ath6k/AR6004/hw1.2/bdata.bin
+lib/firmware/ath6k/AR6004/hw1.2/fw-2.bin
+#lib/firmware/ath6k/AR6004/hw1.3
+lib/firmware/ath6k/AR6004/hw1.3/bdata.bin
+lib/firmware/ath6k/AR6004/hw1.3/fw-3.bin
 lib/firmware/atmsar11.fw
 #lib/firmware/av7110
+#lib/firmware/av7110/Boot.S
+#lib/firmware/av7110/Makefile
 lib/firmware/av7110/bootcode.bin
 #lib/firmware/bnx2
 lib/firmware/bnx2/bnx2-mips-06-4.6.16.fw
@@ -104,6 +144,7 @@ lib/firmware/bnx2/bnx2-mips-06-5.0.0.j3.fw
 lib/firmware/bnx2/bnx2-mips-06-5.0.0.j6.fw
 lib/firmware/bnx2/bnx2-mips-06-6.0.15.fw
 lib/firmware/bnx2/bnx2-mips-06-6.2.1.fw
+lib/firmware/bnx2/bnx2-mips-06-6.2.3.fw
 lib/firmware/bnx2/bnx2-mips-09-4.6.17.fw
 lib/firmware/bnx2/bnx2-mips-09-5.0.0.j15.fw
 lib/firmware/bnx2/bnx2-mips-09-5.0.0.j3.fw
@@ -111,6 +152,7 @@ lib/firmware/bnx2/bnx2-mips-09-5.0.0.j9.fw
 lib/firmware/bnx2/bnx2-mips-09-6.0.17.fw
 lib/firmware/bnx2/bnx2-mips-09-6.2.1.fw
 lib/firmware/bnx2/bnx2-mips-09-6.2.1a.fw
+lib/firmware/bnx2/bnx2-mips-09-6.2.1b.fw
 lib/firmware/bnx2/bnx2-rv2p-06-4.6.16.fw
 lib/firmware/bnx2/bnx2-rv2p-06-5.0.0.j3.fw
 lib/firmware/bnx2/bnx2-rv2p-06-6.0.15.fw
@@ -121,17 +163,48 @@ lib/firmware/bnx2/bnx2-rv2p-09-6.0.17.fw
 lib/firmware/bnx2/bnx2-rv2p-09ax-5.0.0.j10.fw
 lib/firmware/bnx2/bnx2-rv2p-09ax-5.0.0.j3.fw
 lib/firmware/bnx2/bnx2-rv2p-09ax-6.0.17.fw
+#lib/firmware/bnx2x
 lib/firmware/bnx2x-e1-4.8.53.0.fw
 lib/firmware/bnx2x-e1-5.2.13.0.fw
 lib/firmware/bnx2x-e1-5.2.7.0.fw
 lib/firmware/bnx2x-e1h-4.8.53.0.fw
 lib/firmware/bnx2x-e1h-5.2.13.0.fw
 lib/firmware/bnx2x-e1h-5.2.7.0.fw
+lib/firmware/bnx2x/bnx2x-e1-6.0.34.0.fw
+lib/firmware/bnx2x/bnx2x-e1-6.2.5.0.fw
+lib/firmware/bnx2x/bnx2x-e1-6.2.9.0.fw
+lib/firmware/bnx2x/bnx2x-e1-7.0.20.0.fw
+lib/firmware/bnx2x/bnx2x-e1-7.0.23.0.fw
+lib/firmware/bnx2x/bnx2x-e1-7.0.29.0.fw
+lib/firmware/bnx2x/bnx2x-e1-7.2.16.0.fw
+lib/firmware/bnx2x/bnx2x-e1-7.2.51.0.fw
+lib/firmware/bnx2x/bnx2x-e1-7.8.2.0.fw
+lib/firmware/bnx2x/bnx2x-e1h-6.0.34.0.fw
+lib/firmware/bnx2x/bnx2x-e1h-6.2.5.0.fw
+lib/firmware/bnx2x/bnx2x-e1h-6.2.9.0.fw
+lib/firmware/bnx2x/bnx2x-e1h-7.0.20.0.fw
+lib/firmware/bnx2x/bnx2x-e1h-7.0.23.0.fw
+lib/firmware/bnx2x/bnx2x-e1h-7.0.29.0.fw
+lib/firmware/bnx2x/bnx2x-e1h-7.2.16.0.fw
+lib/firmware/bnx2x/bnx2x-e1h-7.2.51.0.fw
+lib/firmware/bnx2x/bnx2x-e1h-7.8.2.0.fw
+lib/firmware/bnx2x/bnx2x-e2-6.0.34.0.fw
+lib/firmware/bnx2x/bnx2x-e2-6.2.5.0.fw
+lib/firmware/bnx2x/bnx2x-e2-6.2.9.0.fw
+lib/firmware/bnx2x/bnx2x-e2-7.0.20.0.fw
+lib/firmware/bnx2x/bnx2x-e2-7.0.23.0.fw
+lib/firmware/bnx2x/bnx2x-e2-7.0.29.0.fw
+lib/firmware/bnx2x/bnx2x-e2-7.2.16.0.fw
+lib/firmware/bnx2x/bnx2x-e2-7.2.51.0.fw
+lib/firmware/bnx2x/bnx2x-e2-7.8.2.0.fw
 #lib/firmware/brcm
 lib/firmware/brcm/bcm4329-fullmac-4.bin
-lib/firmware/brcm/bcm4329-fullmac-4.txt
 lib/firmware/brcm/bcm43xx-0.fw
 lib/firmware/brcm/bcm43xx_hdr-0.fw
+lib/firmware/brcm/brcmfmac43236b.bin
+lib/firmware/brcm/brcmfmac4329.bin
+lib/firmware/brcm/brcmfmac4330.bin
+lib/firmware/brcm/brcmfmac4334.bin
 #lib/firmware/cis
 lib/firmware/cis/3CCFEM556.cis
 lib/firmware/cis/3CXEM556.cis
@@ -140,6 +213,7 @@ lib/firmware/cis/COMpad4.cis
 lib/firmware/cis/DP83903.cis
 lib/firmware/cis/LA-PCM.cis
 lib/firmware/cis/MT5634ZLX.cis
+#lib/firmware/cis/Makefile
 lib/firmware/cis/NE2K.cis
 lib/firmware/cis/PCMLM28.cis
 lib/firmware/cis/PE-200.cis
@@ -163,6 +237,7 @@ lib/firmware/cis/src/PE520.cis
 lib/firmware/cis/src/RS-COM-2P.cis
 lib/firmware/cis/src/tamarack.cis
 lib/firmware/cis/tamarack.cis
+#lib/firmware/configure
 #lib/firmware/cpia2
 lib/firmware/cpia2/stv0672_vp4.bin
 #lib/firmware/cxgb3
@@ -174,17 +249,22 @@ lib/firmware/cxgb3/t3c_psram-1.1.0.bin
 lib/firmware/cxgb3/t3fw-7.0.0.bin
 lib/firmware/cxgb3/t3fw-7.1.0.bin
 lib/firmware/cxgb3/t3fw-7.10.0.bin
+lib/firmware/cxgb3/t3fw-7.12.0.bin
 lib/firmware/cxgb3/t3fw-7.4.0.bin
 #lib/firmware/cxgb4
+lib/firmware/cxgb4/t4fw-1.4.23.0.bin
 lib/firmware/cxgb4/t4fw.bin
 #lib/firmware/dabusb
 lib/firmware/dabusb/bitstream.bin
 lib/firmware/dabusb/firmware.fw
 #lib/firmware/dsp56k
+#lib/firmware/dsp56k/Makefile
 #lib/firmware/dsp56k/bootstrap.asm
 lib/firmware/dsp56k/bootstrap.bin
+#lib/firmware/dsp56k/concat-bootstrap.pl
 lib/firmware/dvb-fe-xc5000-1.6.114.fw
 lib/firmware/dvb-usb-dib0700-1.20.fw
+lib/firmware/dvb-usb-terratec-h5-drxk.fw
 #lib/firmware/e100
 lib/firmware/e100/d101m_ucode.bin
 lib/firmware/e100/d101s_ucode.bin
@@ -204,6 +284,13 @@ lib/firmware/emi62/bitstream.fw
 lib/firmware/emi62/loader.fw
 lib/firmware/emi62/midi.fw
 lib/firmware/emi62/spdif.fw
+#lib/firmware/ene-ub6250
+lib/firmware/ene-ub6250/ms_init.bin
+lib/firmware/ene-ub6250/ms_rdwr.bin
+lib/firmware/ene-ub6250/msp_rdwr.bin
+lib/firmware/ene-ub6250/sd_init1.bin
+lib/firmware/ene-ub6250/sd_init2.bin
+lib/firmware/ene-ub6250/sd_rdwr.bin
 #lib/firmware/ess
 lib/firmware/ess/maestro3_assp_kernel.fw
 lib/firmware/ess/maestro3_assp_minisrc.fw
@@ -214,8 +301,20 @@ lib/firmware/i2400m-fw-usb-1.4.sbcf
 lib/firmware/i2400m-fw-usb-1.5.sbcf
 lib/firmware/i6050-fw-usb-1.5.sbcf
 lib/firmware/intelliport2.bin
+#lib/firmware/isci
+#lib/firmware/isci/Makefile
+lib/firmware/isci/README
+#lib/firmware/isci/create_fw.c
+#lib/firmware/isci/create_fw.h
+lib/firmware/isci/isci_firmware.bin
+#lib/firmware/isci/probe_roms.h
 lib/firmware/iwlwifi-100-5.ucode
 lib/firmware/iwlwifi-1000-3.ucode
+lib/firmware/iwlwifi-1000-5.ucode
+lib/firmware/iwlwifi-105-6.ucode
+lib/firmware/iwlwifi-135-6.ucode
+lib/firmware/iwlwifi-2000-6.ucode
+lib/firmware/iwlwifi-2030-6.ucode
 lib/firmware/iwlwifi-3945-2.ucode
 lib/firmware/iwlwifi-4965-2.ucode
 lib/firmware/iwlwifi-5000-1.ucode
@@ -224,7 +323,9 @@ lib/firmware/iwlwifi-5000-5.ucode
 lib/firmware/iwlwifi-5150-2.ucode
 lib/firmware/iwlwifi-6000-4.ucode
 lib/firmware/iwlwifi-6000g2a-5.ucode
+lib/firmware/iwlwifi-6000g2a-6.ucode
 lib/firmware/iwlwifi-6000g2b-5.ucode
+lib/firmware/iwlwifi-6000g2b-6.ucode
 lib/firmware/iwlwifi-6050-4.ucode
 lib/firmware/iwlwifi-6050-5.ucode
 #lib/firmware/kaweth
@@ -246,14 +347,18 @@ lib/firmware/keyspan/usa28xb.fw
 lib/firmware/keyspan/usa49w.fw
 lib/firmware/keyspan/usa49wlc.fw
 #lib/firmware/keyspan_pda
+#lib/firmware/keyspan_pda/Makefile
 #lib/firmware/keyspan_pda/keyspan_pda.S
 lib/firmware/keyspan_pda/keyspan_pda.fw
 #lib/firmware/keyspan_pda/xircom_pgs.S
 lib/firmware/keyspan_pda/xircom_pgs.fw
 #lib/firmware/korg
 lib/firmware/korg/k1212.dsp
+lib/firmware/lbtf_usb.bin
 lib/firmware/lgs8g75.fw
 #lib/firmware/libertas
+lib/firmware/libertas/cf8381.bin
+lib/firmware/libertas/cf8381_helper.bin
 lib/firmware/libertas/cf8385.bin
 lib/firmware/libertas/cf8385_helper.bin
 lib/firmware/libertas/gspi8682.bin
@@ -262,6 +367,7 @@ lib/firmware/libertas/gspi8686_v9.bin
 lib/firmware/libertas/gspi8686_v9_helper.bin
 lib/firmware/libertas/gspi8688.bin
 lib/firmware/libertas/gspi8688_helper.bin
+lib/firmware/libertas/lbtf_sdio.bin
 lib/firmware/libertas/sd8385.bin
 lib/firmware/libertas/sd8385_helper.bin
 lib/firmware/libertas/sd8682.bin
@@ -272,6 +378,7 @@ lib/firmware/libertas/sd8686_v9.bin
 lib/firmware/libertas/sd8686_v9_helper.bin
 lib/firmware/libertas/sd8688.bin
 lib/firmware/libertas/sd8688_helper.bin
+lib/firmware/libertas/usb8388_olpc.bin
 lib/firmware/libertas/usb8388_v5.bin
 lib/firmware/libertas/usb8388_v9.bin
 lib/firmware/libertas/usb8682.bin
@@ -285,7 +392,6 @@ lib/firmware/mts_edge.fw
 lib/firmware/mts_gsm.fw
 lib/firmware/mts_mt9234mu.fw
 lib/firmware/mts_mt9234zba.fw
-lib/firmware/mwl8335_duplex.fw
 #lib/firmware/mwl8k
 lib/firmware/mwl8k/fmimage_8366.fw
 lib/firmware/mwl8k/fmimage_8366_ap-1.fw
@@ -317,6 +423,9 @@ lib/firmware/qlogic/sd7220.fw
 #lib/firmware/r128
 lib/firmware/r128/r128_cce.bin
 #lib/firmware/radeon
+lib/firmware/radeon/ARUBA_me.bin
+lib/firmware/radeon/ARUBA_pfp.bin
+lib/firmware/radeon/ARUBA_rlc.bin
 lib/firmware/radeon/BARTS_mc.bin
 lib/firmware/radeon/BARTS_me.bin
 lib/firmware/radeon/BARTS_pfp.bin
@@ -339,6 +448,11 @@ lib/firmware/radeon/JUNIPER_pfp.bin
 lib/firmware/radeon/JUNIPER_rlc.bin
 lib/firmware/radeon/PALM_me.bin
 lib/firmware/radeon/PALM_pfp.bin
+lib/firmware/radeon/PITCAIRN_ce.bin
+lib/firmware/radeon/PITCAIRN_mc.bin
+lib/firmware/radeon/PITCAIRN_me.bin
+lib/firmware/radeon/PITCAIRN_pfp.bin
+lib/firmware/radeon/PITCAIRN_rlc.bin
 lib/firmware/radeon/R100_cp.bin
 lib/firmware/radeon/R200_cp.bin
 lib/firmware/radeon/R300_cp.bin
@@ -371,10 +485,24 @@ lib/firmware/radeon/RV730_me.bin
 lib/firmware/radeon/RV730_pfp.bin
 lib/firmware/radeon/RV770_me.bin
 lib/firmware/radeon/RV770_pfp.bin
+lib/firmware/radeon/SUMO2_me.bin
+lib/firmware/radeon/SUMO2_pfp.bin
+lib/firmware/radeon/SUMO_me.bin
+lib/firmware/radeon/SUMO_pfp.bin
 lib/firmware/radeon/SUMO_rlc.bin
+lib/firmware/radeon/TAHITI_ce.bin
+lib/firmware/radeon/TAHITI_mc.bin
+lib/firmware/radeon/TAHITI_me.bin
+lib/firmware/radeon/TAHITI_pfp.bin
+lib/firmware/radeon/TAHITI_rlc.bin
 lib/firmware/radeon/TURKS_mc.bin
 lib/firmware/radeon/TURKS_me.bin
 lib/firmware/radeon/TURKS_pfp.bin
+lib/firmware/radeon/VERDE_ce.bin
+lib/firmware/radeon/VERDE_mc.bin
+lib/firmware/radeon/VERDE_me.bin
+lib/firmware/radeon/VERDE_pfp.bin
+lib/firmware/radeon/VERDE_rlc.bin
 lib/firmware/rt2561.bin
 lib/firmware/rt2561s.bin
 lib/firmware/rt2661.bin
@@ -383,20 +511,31 @@ lib/firmware/rt2870.bin
 lib/firmware/rt3070.bin
 lib/firmware/rt3071.bin
 lib/firmware/rt3090.bin
+lib/firmware/rt3290.bin
 lib/firmware/rt73.bin
 #lib/firmware/rtl_nic
 lib/firmware/rtl_nic/rtl8105e-1.fw
+lib/firmware/rtl_nic/rtl8106e-1.fw
 lib/firmware/rtl_nic/rtl8168d-1.fw
 lib/firmware/rtl_nic/rtl8168d-2.fw
 lib/firmware/rtl_nic/rtl8168e-1.fw
 lib/firmware/rtl_nic/rtl8168e-2.fw
 lib/firmware/rtl_nic/rtl8168e-3.fw
+lib/firmware/rtl_nic/rtl8168f-1.fw
+lib/firmware/rtl_nic/rtl8168f-2.fw
+lib/firmware/rtl_nic/rtl8168g-1.fw
+lib/firmware/rtl_nic/rtl8402-1.fw
+lib/firmware/rtl_nic/rtl8411-1.fw
 #lib/firmware/rtlwifi
 lib/firmware/rtlwifi/rtl8192cfw.bin
+lib/firmware/rtlwifi/rtl8192cfwU.bin
+lib/firmware/rtlwifi/rtl8192cfwU_B.bin
 lib/firmware/rtlwifi/rtl8192cufw.bin
 lib/firmware/rtlwifi/rtl8192defw.bin
 lib/firmware/rtlwifi/rtl8192sefw.bin
 lib/firmware/rtlwifi/rtl8712u.bin
+lib/firmware/rtlwifi/rtl8723fw.bin
+lib/firmware/rtlwifi/rtl8723fw_B.bin
 lib/firmware/s2250.fw
 lib/firmware/s2250_loader.fw
 #lib/firmware/sb16
@@ -423,10 +562,29 @@ lib/firmware/ti-connectivity/TIInit_7.2.31.bts
 lib/firmware/ti-connectivity/wl1271-fw-2.bin
 lib/firmware/ti-connectivity/wl1271-fw-ap.bin
 lib/firmware/ti-connectivity/wl1271-fw.bin
-lib/firmware/ti-connectivity/wl1271-nvs-example-wl128x.bin
 lib/firmware/ti-connectivity/wl1271-nvs.bin
+lib/firmware/ti-connectivity/wl127x-fw-3.bin
+lib/firmware/ti-connectivity/wl127x-fw-4-mr.bin
+lib/firmware/ti-connectivity/wl127x-fw-4-plt.bin
+lib/firmware/ti-connectivity/wl127x-fw-4-sr.bin
+lib/firmware/ti-connectivity/wl127x-fw-5-mr.bin
+lib/firmware/ti-connectivity/wl127x-fw-5-plt.bin
+lib/firmware/ti-connectivity/wl127x-fw-5-sr.bin
+lib/firmware/ti-connectivity/wl127x-fw-plt-3.bin
+lib/firmware/ti-connectivity/wl127x-nvs.bin
+lib/firmware/ti-connectivity/wl128x-fw-3.bin
+lib/firmware/ti-connectivity/wl128x-fw-4-mr.bin
+lib/firmware/ti-connectivity/wl128x-fw-4-plt.bin
+lib/firmware/ti-connectivity/wl128x-fw-4-sr.bin
+lib/firmware/ti-connectivity/wl128x-fw-5-mr.bin
+lib/firmware/ti-connectivity/wl128x-fw-5-plt.bin
+lib/firmware/ti-connectivity/wl128x-fw-5-sr.bin
 lib/firmware/ti-connectivity/wl128x-fw-ap.bin
+lib/firmware/ti-connectivity/wl128x-fw-plt-3.bin
 lib/firmware/ti-connectivity/wl128x-fw.bin
+lib/firmware/ti-connectivity/wl128x-nvs.bin
+lib/firmware/ti-connectivity/wl12xx-nvs.bin
+lib/firmware/ti-connectivity/wl18xx-fw.bin
 lib/firmware/ti_3410.fw
 lib/firmware/ti_5052.fw
 #lib/firmware/tigon
@@ -468,8 +626,10 @@ lib/firmware/ueagle-atm/eagleIV.fw
 #lib/firmware/usbdux/fx2-include.asm
 #lib/firmware/usbdux/usbdux_firmware.asm
 #lib/firmware/usbdux/usbduxfast_firmware.asm
+#lib/firmware/usbdux/usbduxsigma_firmware.asm
 lib/firmware/usbdux_firmware.bin
 lib/firmware/usbduxfast_firmware.bin
+lib/firmware/usbduxsigma_firmware.bin
 lib/firmware/v4l-cx231xx-avcore-01.fw
 lib/firmware/v4l-cx23418-apu.fw
 lib/firmware/v4l-cx23418-cpu.fw
diff --git a/config/rootfiles/common/zlib b/config/rootfiles/common/zlib
index 8c4684360..13cf70441 100644
--- a/config/rootfiles/common/zlib
+++ b/config/rootfiles/common/zlib
@@ -1,9 +1,10 @@
+lib/libz.so
 lib/libz.so.1
 lib/libz.so.1.2.7
 #usr/include/zconf.h
 #usr/include/zlib.h
 #usr/lib/libz.a
-usr/lib/libz.so
+#usr/lib/libz.so
 #usr/lib/pkgconfig
 #usr/lib/pkgconfig/zlib.pc
 #usr/share/man/man3/zlib.3
diff --git a/config/rootfiles/core/63/exclude b/config/rootfiles/core/63/exclude
new file mode 100644
index 000000000..b6a8d1dfa
--- /dev/null
+++ b/config/rootfiles/core/63/exclude
@@ -0,0 +1,13 @@
+srv/web/ipfire/html/proxy.pac
+etc/udev/rules.d/30-persistent-network.rules
+etc/ipsec.conf
+etc/ipsec.secrets
+etc/ipsec.user.conf
+etc/ipsec.user.secrets
+var/updatecache
+etc/localtime
+var/ipfire/ovpn
+etc/ssh/ssh_config
+etc/ssh/sshd_config
+etc/ssl/openssl.cnf
+var/state/dhcp/dhcpd.leases
diff --git a/config/rootfiles/core/63/filelists/GeoIP b/config/rootfiles/core/63/filelists/GeoIP
new file mode 100644
index 000000000..0258236c0
--- /dev/null
+++ b/config/rootfiles/core/63/filelists/GeoIP
@@ -0,0 +1 @@
+usr/local/share/GeoIP/GeoIP.dat
diff --git a/config/rootfiles/core/63/filelists/apache2 b/config/rootfiles/core/63/filelists/apache2
new file mode 120000
index 000000000..eef95efa7
--- /dev/null
+++ b/config/rootfiles/core/63/filelists/apache2
@@ -0,0 +1 @@
+../../../common/apache2
\ No newline at end of file
diff --git a/config/rootfiles/core/63/filelists/dhcp b/config/rootfiles/core/63/filelists/dhcp
new file mode 120000
index 000000000..32d8da443
--- /dev/null
+++ b/config/rootfiles/core/63/filelists/dhcp
@@ -0,0 +1 @@
+../../../common/dhcp
\ No newline at end of file
diff --git a/config/rootfiles/core/63/filelists/files b/config/rootfiles/core/63/filelists/files
new file mode 100644
index 000000000..1455a873c
--- /dev/null
+++ b/config/rootfiles/core/63/filelists/files
@@ -0,0 +1,5 @@
+etc/system-release
+etc/issue
+etc/rc.d/init.d/network-vlans
+srv/web/ipfire/cgi-bin/index.cgi
+srv/web/ipfire/cgi-bin/ovpnmain.cgi
diff --git a/config/rootfiles/core/63/filelists/fireinfo b/config/rootfiles/core/63/filelists/fireinfo
new file mode 120000
index 000000000..c46115521
--- /dev/null
+++ b/config/rootfiles/core/63/filelists/fireinfo
@@ -0,0 +1 @@
+../../../common/fireinfo
\ No newline at end of file
diff --git a/config/rootfiles/core/63/filelists/inetutils b/config/rootfiles/core/63/filelists/inetutils
new file mode 120000
index 000000000..bcd329b8a
--- /dev/null
+++ b/config/rootfiles/core/63/filelists/inetutils
@@ -0,0 +1 @@
+../../../common/inetutils
\ No newline at end of file
diff --git a/config/rootfiles/core/63/meta b/config/rootfiles/core/63/meta
new file mode 100644
index 000000000..d547fa86f
--- /dev/null
+++ b/config/rootfiles/core/63/meta
@@ -0,0 +1 @@
+DEPS=""
diff --git a/config/rootfiles/core/63/update.sh b/config/rootfiles/core/63/update.sh
new file mode 100644
index 000000000..f0764aebd
--- /dev/null
+++ b/config/rootfiles/core/63/update.sh
@@ -0,0 +1,85 @@
+#!/bin/bash
+############################################################################
+#                                                                          #
+# This file is part of the IPFire Firewall.                                #
+#                                                                          #
+# IPFire is free software; you can redistribute it and/or modify           #
+# it under the terms of the GNU General Public License as published by     #
+# the Free Software Foundation; either version 3 of the License, or        #
+# (at your option) any later version.                                      #
+#                                                                          #
+# IPFire is distributed in the hope that it will be useful,                #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of           #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            #
+# GNU General Public License for more details.                             #
+#                                                                          #
+# You should have received a copy of the GNU General Public License        #
+# along with IPFire; if not, write to the Free Software                    #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
+#                                                                          #
+# Copyright (C) 2012 IPFire-Team <info@ipfire.org>.                        #
+#                                                                          #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1
+
+#
+# Remove old core updates from pakfire cache to save space...
+core=63
+for (( i=1; i<=$core; i++ ))
+do
+	rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
+done
+
+# Remove old symlink to DHCP server configuration file.
+rm -f /etc/dhcpd.conf
+
+#
+#Stop services
+/etc/init.d/apache stop
+
+#
+#Extract files
+extract_files
+
+#
+#Start services
+/etc/init.d/apache start
+
+#
+#Update Language cache
+#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
+
+#Rebuild module dep's
+#arch=`uname -m`
+#if [ ${arch::3} == "arm" ]; then
+#	depmod -a 2.6.32.45-ipfire-versatile >/dev/null 2>&1
+#	depmod -a 2.6.32.45-ipfire-kirkwood >/dev/null 2>&1
+#else
+#	depmod -a 2.6.32.45-ipfire     >/dev/null 2>&1
+#	depmod -a 2.6.32.45-ipfire-pae >/dev/null 2>&1
+#	depmod -a 2.6.32.45-ipfire-xen >/dev/null 2>&1
+#fi
+
+
+#Rebuild initrd's because some compat-wireless modules are inside
+#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45.img 2.6.32.45-ipfire
+#if [ -e /boot/ipfirerd-2.6.32.45-pae.img ]; then
+#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45-pae.img 2.6.32.45-ipfire-pae
+#fi
+#if [ -e /boot/ipfirerd-2.6.32.45-xen.img ]; then
+#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45-xen.img 2.6.32.45-ipfire-xen
+#fi
+
+sync
+
+# This update need a reboot...
+#touch /var/run/need_reboot
+
+#
+#Finish
+/etc/init.d/fireinfo start
+sendprofile
+#Don't report the exitcode last command
+exit 0
diff --git a/config/rootfiles/packages/clamav b/config/rootfiles/packages/clamav
index 6987adeda..db38453ff 100644
--- a/config/rootfiles/packages/clamav
+++ b/config/rootfiles/packages/clamav
@@ -10,15 +10,15 @@ usr/bin/sigtool
 #usr/lib/libclamav.la
 usr/lib/libclamav.so
 usr/lib/libclamav.so.6
-usr/lib/libclamav.so.6.1.14
+usr/lib/libclamav.so.6.1.15
 #usr/lib/libclamunrar.la
 usr/lib/libclamunrar.so
 usr/lib/libclamunrar.so.6
-usr/lib/libclamunrar.so.6.1.14
+usr/lib/libclamunrar.so.6.1.15
 #usr/lib/libclamunrar_iface.la
 usr/lib/libclamunrar_iface.so
 usr/lib/libclamunrar_iface.so.6
-usr/lib/libclamunrar_iface.so.6.1.14
+usr/lib/libclamunrar_iface.so.6.1.15
 #usr/lib/pkgconfig/libclamav.pc
 usr/sbin/clamd
 usr/share/clamav
diff --git a/config/u-boot/boot.scr b/config/u-boot/boot.scr
index 784c1213f..aad40aead 100755
Binary files a/config/u-boot/boot.scr and b/config/u-boot/boot.scr differ
diff --git a/config/u-boot/boot.script b/config/u-boot/boot.script
index 795e60fd1..0f7181535 100755
--- a/config/u-boot/boot.script
+++ b/config/u-boot/boot.script
@@ -1,4 +1,4 @@
 fatload mmc 0:1 0x80000000 uImage-ipfire-omap
 fatload mmc 0:1 0x81600000 uInit-ipfire-omap
-setenv bootargs vram=32M console=tty1 omapfb.mode=dvi:800x600MR-16@60 rootwait smsc95xx.macaddr=$usbethaddr root=/dev/mmcblk0p3 ro
+setenv bootargs vram=32M console=tty1 rootwait smsc95xx.macaddr=$usbethaddr root=/dev/mmcblk0p3 ro
 bootm 0x80000000 0x81600000
diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi
index 04a87cf63..6919c8cf5 100644
--- a/html/cgi-bin/index.cgi
+++ b/html/cgi-bin/index.cgi
@@ -241,19 +241,22 @@ END
 print <<END;
 
 
+
 <!-- Table of networks -->
 <table border='0' width=80%>
-  <tr>	<th bgcolor='$color{'color20'}'>$Lang::tr{'network'}
-	<th bgcolor='$color{'color20'}'>IP
-	<th bgcolor='$color{'color20'}'>$Lang::tr{'status'}
-  <tr>	<td align='center' bgcolor='$Header::colourred' width='25%'><a href="/cgi-bin/pppsetup.cgi"><font size='2' color='white'><b>$Lang::tr{'internet'}</b></font></a><br>
-	<td width='30%' align='center'>$ipaddr 
-	<td width='45%' align='center'>$connstate
+  <tr>  <th bgcolor='$color{'color20'}'>$Lang::tr{'network'}</th>
+        <th bgcolor='$color{'color20'}'>IP</th>
+        <th bgcolor='$color{'color20'}'>$Lang::tr{'status'}</th></tr>
+  <tr>  <td align='center' bgcolor='$Header::colourred' width='25%'><a href="/cgi-bin/pppsetup.cgi"><font size='2' color='white'><b>$Lang::tr{'internet'}</b></font></a><br></td>
+        <td width='30%' align='center'>$ipaddr </td>
+        <td width='45%' align='center'>$connstate 
 END
 if ( $netsettings{'RED_TYPE'} ne "STATIC" && $netsettings{'RED_TYPE'} ne "DHCP" ){
 print `/usr/local/bin/dialctrl.pl show`;
 print <<END;
-	<tr><td colspan='2'>
+        </td></tr>
+        <tr><td colspan='2'>
+
 		<form method='post' action='$ENV{'SCRIPT_NAME'}'>$Lang::tr{'profile'}:
 			<select name='PROFILE'>
 END
diff --git a/lfs/GeoIP b/lfs/GeoIP
index 41a82e929..3dd7e6fb8 100644
--- a/lfs/GeoIP
+++ b/lfs/GeoIP
@@ -25,7 +25,7 @@
 include Config
 
 VER        = 1.17
-DATVER     = 05092012
+DATVER     = 02102012
 
 THISAPP    = Geo-IP-PurePerl-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -43,7 +43,7 @@ $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 GeoIP.dat-$(DATVER).gz = $(DL_FROM)/GeoIP.dat-$(DATVER).gz
 
 $(DL_FILE)_MD5 = 42a6b9d4dd2563a20c8998556216e1de
-GeoIP.dat-$(DATVER).gz_MD5 = c053f11cb8383fb8f4826591b0cbae3d
+GeoIP.dat-$(DATVER).gz_MD5 = 371c7ea4a8c8b963594ec3031e798696
 
 install : $(TARGET)
 
diff --git a/lfs/apache2 b/lfs/apache2
index bcc9155ae..c3d915602 100644
--- a/lfs/apache2
+++ b/lfs/apache2
@@ -25,7 +25,7 @@
 
 include Config
 
-VER        = 2.2.22
+VER        = 2.2.23
 
 THISAPP    = httpd-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -47,7 +47,7 @@ objects = $(DL_FILE) \
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 httpd-2.2.2-config-1.patch = $(DL_FROM)/httpd-2.2.2-config-1.patch
 
-$(DL_FILE)_MD5 = 9fe3093194c8a57f085ff7c3fc43715f
+$(DL_FILE)_MD5 = ca133de0e4b4b15316990a97186b9993
 httpd-2.2.2-config-1.patch_MD5 = e02a3ec5925eb9e111400b9aa229f822
 
 install : $(TARGET)
@@ -133,10 +133,9 @@ else
 	cd $(DIR_APP) && make install
 	chown -v root:root /usr/lib/apache/httpd.exp \
 	    /usr/sbin/{apxs,apachectl,dbmmanage,envvars{,-std}} \
-	    /usr/share/man/man1/{ab,apxs,dbmmanage,ht{dbm,digest,passwd,txt2dbm}}.1 \
-	    /usr/share/man/man1/logresolve.1 \
-	    /usr/share/man/man8/{apachectl,htcacheclean,httpd}.8 \
-	    /usr/share/man/man8/{rotatelogs,suexec}.8
+	    /usr/share/man/man1/{dbmmanage,ht{dbm,digest,passwd,txt2dbm}}.1 \
+	    /usr/share/man/man8/{ab,apachectl,apxs,htcacheclean,httpd}.8 \
+	    /usr/share/man/man8/{logresolve,rotatelogs,suexec}.8
 	@rm -rf $(DIR_APP)
 endif
 	@$(POSTBUILD)
diff --git a/lfs/clamav b/lfs/clamav
index a71702302..a2ed1f066 100644
--- a/lfs/clamav
+++ b/lfs/clamav
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 0.97.5
+VER        = 0.97.6
 
 THISAPP    = clamav-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = clamav
-PAK_VER    = 20
+PAK_VER    = 21
 
 DEPS       = ""
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 4d4b93243a5add0216acc4f24f43a895
+$(DL_FILE)_MD5 = 1dbdd803b37c0d9d222e4316049f46a2
 
 install : $(TARGET)
 
diff --git a/lfs/dhcp b/lfs/dhcp
index 603dbd73f..083c31fa1 100644
--- a/lfs/dhcp
+++ b/lfs/dhcp
@@ -112,7 +112,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_APP) && \
 		./configure \
 			--prefix=/usr \
-			--sysconfdir=/etc \
+			--sysconfdir=/etc/dhcp \
 			--with-srv-lease-file=/var/state/dhcp/dhcpd.leases \
 			--disable-static \
 			--enable-paranoia \
@@ -125,6 +125,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	mkdir -pv /var/state/dhcp
 	touch /var/state/dhcp/dhcpd.leases
 
-	ln -sf $(CONFIG_ROOT)/dhcp/dhcpd.conf /etc/dhcpd.conf
+	ln -svf $(CONFIG_ROOT)/dhcp/dhcpd.conf /etc/dhcp/dhcpd.conf
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
diff --git a/lfs/dracut b/lfs/dracut
index f2195a70b..0779a6b73 100644
--- a/lfs/dracut
+++ b/lfs/dracut
@@ -96,7 +96,7 @@ ifeq "$(MACHINE_TYPE)" "arm"
 	/sbin/dracut --force --verbose --strip /boot/ipfirerd-$(KVER)-kirkwood.img $(KVER)-ipfire-kirkwood
 	cd /boot && mkimage -A arm -T ramdisk -C lzma -d ipfirerd-$(KVER)-kirkwood.img uInit-ipfire-kirkwood
 	# omap kernel
-	/sbin/dracut --force --verbose --strip /boot/ipfirerd-$(KVER)-omap.img $(KVER3)-ipfire-omap
+	/sbin/dracut --force --verbose --strip /boot/ipfirerd-$(KVER)-omap.img $(KVER)-ipfire-omap
 	cd /boot && mkimage -A arm -T ramdisk -C lzma -d ipfirerd-$(KVER)-omap.img uInit-ipfire-omap
 else
 	/sbin/dracut --force --verbose --strip /boot/ipfirerd-$(KVER).img $(KVER)-ipfire
diff --git a/lfs/fw_ath9k_htc b/lfs/fw_ath9k_htc
deleted file mode 100644
index ebd686e3b..000000000
--- a/lfs/fw_ath9k_htc
+++ /dev/null
@@ -1,75 +0,0 @@
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2011  IPFire Team  <info@ipfire.org>                          #
-#                                                                             #
-# This program is free software: you can redistribute it and/or modify        #
-# it under the terms of the GNU General Public License as published by        #
-# the Free Software Foundation, either version 3 of the License, or           #
-# (at your option) any later version.                                         #
-#                                                                             #
-# This program is distributed in the hope that it will be useful,             #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
-# GNU General Public License for more details.                                #
-#                                                                             #
-# You should have received a copy of the GNU General Public License           #
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
-#                                                                             #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-VER        = 1.3
-
-THISAPP    = fw_ath9k_htc-$(VER)
-DL_FILE    = $(THISAPP).tar.xz
-DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/$(THISAPP)
-TARGET     = $(DIR_INFO)/$(THISAPP)
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_MD5 = 6e83c7d87007e3edd700034990cccd61
-
-install : $(TARGET)
-
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-
-md5 : $(subst %,%_MD5,$(objects))
-
-###############################################################################
-# Downloading, checking, md5sum
-###############################################################################
-
-$(patsubst %,$(DIR_CHK)/%,$(objects)) :
-	@$(CHECK)
-
-$(patsubst %,$(DIR_DL)/%,$(objects)) :
-	@$(LOAD)
-
-$(subst %,%_MD5,$(objects)) :
-	@$(MD5)
-
-###############################################################################
-# Installation Details
-###############################################################################
-
-$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
-	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && cp -v htc*.fw /lib/firmware
-	@rm -rf $(DIR_APP)
-	@$(POSTBUILD)
diff --git a/lfs/linux b/lfs/linux
index b481e65b5..530b388c9 100644
--- a/lfs/linux
+++ b/lfs/linux
@@ -26,7 +26,7 @@ include Config
 
 VER           = 3.2.30
 
-RPI_PATCHES = linux-3.2.27-807223a
+RPI_PATCHES = linux-3.2.27-9245b4c
 
 THISAPP    = linux-$(VER)
 DL_FILE    = linux-$(VER).tar.bz2
@@ -76,7 +76,7 @@ $(DL_FILE)				= $(URL_IPFIRE)/$(DL_FILE)
 rpi-patches-$(RPI_PATCHES).patch.xz	= $(URL_IPFIRE)/rpi-patches-$(RPI_PATCHES).patch.xz
 
 $(DL_FILE)_MD5				= d899e65520424a27661009ea43b28103
-rpi-patches-$(RPI_PATCHES).patch.xz_MD5	= b072ccb2534ff910fd5867fc0da1b24a
+rpi-patches-$(RPI_PATCHES).patch.xz_MD5	= c20baa8dc2527ce89a302862c3fc7f58
 
 install : $(TARGET)
 
diff --git a/lfs/linux-firmware b/lfs/linux-firmware
index 6a7f95652..33a53810e 100644
--- a/lfs/linux-firmware
+++ b/lfs/linux-firmware
@@ -24,10 +24,10 @@
 
 include Config
 
-VER        = 20110518
+VER        = 236367d
 
 THISAPP    = linux-firmware-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
+DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 3b215b5ec9a5e8784dd971c039e9b948
+$(DL_FILE)_MD5 = 35d2ecf9b7d0b4d339fa0d4cc0736f6f
 
 install : $(TARGET)
 
@@ -69,7 +69,7 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 	mkdir -p /lib/firmware
 	cd $(DIR_APP) && cp -vr * /lib/firmware
 	@rm -rf $(DIR_APP)
diff --git a/lfs/rpi-firmware b/lfs/rpi-firmware
index 2143d2395..bae9303ee 100644
--- a/lfs/rpi-firmware
+++ b/lfs/rpi-firmware
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 9f7cff0
+VER        = b87bc42
 THISAPP    = rpi-firmware-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 4de4db529fc2c0000d381d016675e115
+$(DL_FILE)_MD5 = 2e2bb3a72e9a13a90c60c84f76e77fa2
 
 install : $(TARGET)
 
@@ -70,5 +70,5 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@cd / && tar axf $(DIR_DL)/$(DL_FILE)
-	cp $(DIR_SRC)/config/rpi-firmware/config.txt /boot
+	cp -f $(DIR_SRC)/config/rpi-firmware/config.txt /boot
 	@$(POSTBUILD)
diff --git a/lfs/samba b/lfs/samba
index 9c6a3b65d..474175416 100644
--- a/lfs/samba
+++ b/lfs/samba
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 3.5.16
+VER        = 3.5.18
 
 THISAPP    = samba-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = samba
-PAK_VER    = 41
+PAK_VER    = 42
 
 DEPS       = "cups"
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 260cf49b683e86f4cc316c1e6fddbdc5
+$(DL_FILE)_MD5 = 4bdb6d7ef23369d1c7d0199f0ebe012a
 
 install : $(TARGET)
 
diff --git a/lfs/v4l-dvb b/lfs/v4l-dvb
index 5f2751ad2..cde3efc82 100644
--- a/lfs/v4l-dvb
+++ b/lfs/v4l-dvb
@@ -79,6 +79,19 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/v4l-dvb_rtl28xx_add_usb_ids.patch
 	cd $(DIR_APP) && make allyesconfig KERNELRELEASE=$(KVER)-$(VERSUFIX) VER=$(XVER)
+ifeq "$(KCFG)" "-omap"
+	# Disable failing OMAP2 Video Out and IR RX51 driver
+	cd $(DIR_APP) && sed -i -e \
+		"s|^CONFIG_VIDEO_OMAP2_VOUT=m|# CONFIG_VIDEO_OMAP2_VOUT is not set|g" \
+		v4l/.config
+	cd $(DIR_APP) && sed -i -e \
+		"s|^CONFIG_IR_RX51=m|# CONFIG_IR_RX51 is not set|g" \
+		v4l/.config
+endif
+	# Disable Radio Shark (missing tuner module)
+	cd $(DIR_APP) && sed -i -e \
+		"s|^CONFIG_RADIO_SHARK=m|# CONFIG_RADIO_SHARK is not set|g" \
+		v4l/.config
 	cd $(DIR_APP) && make all KERNELRELEASE=$(KVER)-$(VERSUFIX) VER=$(XVER)
 	cd $(DIR_APP) && make install KERNELRELEASE=$(KVER)-$(VERSUFIX) VER=$(XVER)
 	ln -sf $(DIR_APP)/ /usr/src/v4l-dvb
diff --git a/lfs/zlib b/lfs/zlib
index 5337c7724..0a2977d0d 100644
--- a/lfs/zlib
+++ b/lfs/zlib
@@ -77,7 +77,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 
 	mv -v /usr/lib/libz.so.$(VER) /lib/libz.so.$(VER)
 	ln -svf libz.so.$(VER) /lib/libz.so.1
+	ln -svf libz.so.$(VER) /lib/libz.so
 	rm -vf /usr/lib/libz.so.1
+	rm -vf /usr/lib/libz.so
 
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
diff --git a/make.sh b/make.sh
index f15f8a5f2..29307defd 100755
--- a/make.sh
+++ b/make.sh
@@ -25,8 +25,8 @@
 NAME="IPFire"							# Software name
 SNAME="ipfire"							# Short name
 VERSION="2.13"							# Version number
-CORE="62"							# Core Level (Filename)
-PAKFIRE_CORE="62"						# Core Level (PAKFIRE)
+CORE="63"							# Core Level (Filename)
+PAKFIRE_CORE="63"						# Core Level (PAKFIRE)
 GIT_BRANCH=`git status | head -n1 | cut -d" " -f4`		# Git Branch
 SLOGAN="www.ipfire.org"						# Software slogan
 CONFIG_ROOT=/var/ipfire						# Configuration rootdir
@@ -374,7 +374,6 @@ buildipfire() {
   ipfiremake linux-firmware
   ipfiremake zd1211-firmware
   ipfiremake rpi-firmware
-  ipfiremake fw_ath9k_htc
   ipfiremake u-boot
 
   # The xen and PAE kernels are only available for x86
@@ -435,7 +434,7 @@ buildipfire() {
 #    ipfiremake igb			KCFG="-rpi"
 
     ipfiremake linux			KCFG="-omap"
-#    ipfiremake v4l-dvb			KCFG="-omap"
+    ipfiremake v4l-dvb			KCFG="-omap"
 #    ipfiremake kvm-kmod			KCFG="-omap"
 #    ipfiremake mISDN			KCFG="-omap"
     ipfiremake cryptodev		KCFG="-omap"
diff --git a/src/install+setup/libsmooth/netstuff.c b/src/install+setup/libsmooth/netstuff.c
index 46e49c01b..de5c558c0 100644
--- a/src/install+setup/libsmooth/netstuff.c
+++ b/src/install+setup/libsmooth/netstuff.c
@@ -221,7 +221,14 @@ int changeaddress(struct keyvalue *kv, char *colour, int typeflag,
 				setnetaddress(kv, colour);
 				result = 1;
 			}
-		}			
+		}
+		/* Workaround for a bug that dhcp radiobutton also end the dialog at arm
+		*/
+		else {
+			if (es.u.co != cancel) {
+				error = 1;
+			}
+		}
 	}
 	while (error);
 
@@ -322,7 +329,7 @@ void networkdialogcallbacktype(newtComponent cm, void *data)
 		newtEntrySetFlags(dhcpforcemtuentry, NEWT_FLAG_DISABLED, NEWT_FLAGS_SET);		
 	}
 	newtRefresh();
-	newtDrawForm(networkform);	
+	newtDrawForm(networkform);
 }
 
 int interfacecheck(struct keyvalue *kv, char *colour)
diff --git a/src/scripts/scanhd b/src/scripts/scanhd
index f46a63073..b208bbb1d 100644
--- a/src/scripts/scanhd
+++ b/src/scripts/scanhd
@@ -11,7 +11,7 @@ case "$1" in
 		done
 		;;
 	partitions)
-		cat /proc/partitions | awk '{print $4 " " $3 }' | grep -v name | grep -v "^[:space:]*$" | \
+		cat /proc/partitions | awk '{print $4 " " $3 }' | grep -v name | grep -v "^[[:space:]]*$" | \
 			while read device size; do
 				[ -z "${device}" ] && continue
 				echo "${device};${size};$(blkid -c /dev/null -s UUID -o value /dev/${device});"