Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x into seventeen-geoip

Conflicts: make.sh
2026-04-09 18:45:54 +02:00 · 2015-02-14 12:34:31 +01:00
parent d9bf6d8b2f 309b7de86e
commit bc9446c65f
173 changed files with 66176 additions and 3094 deletions
--- a/config/etc/modprobe.d/btmrvl_sdio.conf
+++ b/config/etc/modprobe.d/btmrvl_sdio.conf
@@ -0,0 +1,2 @@
+# seems to crash often
+blacklist btmrvl_sdio
--- a/config/firewall/rules.pl
+++ b/config/firewall/rules.pl
@@ -284,7 +284,7 @@ sub buildrules {
 		# Concurrent connection limit
 		my @ratelimit_options = ();

-		if (($elements gt 34) && ($$hash{$key}[32] eq 'ON')) {
+		if (($elements ge 34) && ($$hash{$key}[32] eq 'ON')) {
 			my $conn_limit = $$hash{$key}[33];

 			if ($conn_limit ge 1) {
@@ -300,13 +300,13 @@ sub buildrules {
 		}

 		# Ratelimit
-		if (($elements gt 37) && ($$hash{$key}[34] eq 'ON')) {
+		if (($elements ge 37) && ($$hash{$key}[34] eq 'ON')) {
 			my $rate_limit = "$$hash{$key}[35]/$$hash{$key}[36]";

-				if ($rate_limit) {
-					push(@ratelimit_options, ("-m", "limit"));
-					push(@ratelimit_options, ("--limit", $rate_limit));
-				}
+			if ($rate_limit) {
+				push(@ratelimit_options, ("-m", "limit"));
+				push(@ratelimit_options, ("--limit", $rate_limit));
+			}
 		}

 		# Check which protocols are used in this rule and so that we can
@@ -372,20 +372,12 @@ sub buildrules {
 						push(@source_options, ("-s", $source));
 					}

-					if ($source_intf) {
-						push(@source_options, ("-i", $source_intf));
-					}
-
 					# Prepare destination options.
 					my @destination_options = ();
 					if ($destination) {
 						push(@destination_options, ("-d", $destination));
 					}

-					if ($destination_intf) {
-						push(@destination_options, ("-o", $destination_intf));
-					}
-
 					# Add time constraint options.
 					push(@options, @time_options);

@@ -480,6 +472,17 @@ sub buildrules {
 						}
 					}

+					# Add source and destination interface to the filter rules.
+					# These are supposed to help filtering forged packets that originate
+					# from BLUE with an IP address from GREEN for instance.
+					if ($source_intf) {
+						push(@source_options, ("-i", $source_intf));
+					}
+
+					if ($destination_intf) {
+						push(@destination_options, ("-o", $destination_intf));
+					}
+
 					push(@options, @source_options);
 					push(@options, @destination_options);

--- a/config/hostapd/hostapd.conf
+++ b/config/hostapd/hostapd.conf
@@ -3,7 +3,7 @@ driver=nl80211
 #
 interface=blue0
 hw_mode=g
-channel=05
+channel=6
 logger_syslog=-1
 logger_syslog_level=3
 logger_stdout=-1
--- a/config/kernel/kernel.config.armv5tel-ipfire-kirkwood
+++ b/config/kernel/kernel.config.armv5tel-ipfire-kirkwood
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.14.22 Kernel Configuration
+# Linux/arm 3.14.30 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -3079,7 +3079,7 @@ CONFIG_REGULATOR_LP8755=m
 # CONFIG_REGULATOR_TPS62360 is not set
 # CONFIG_REGULATOR_TPS65023 is not set
 # CONFIG_REGULATOR_TPS6507X is not set
-CONFIG_MEDIA_SUPPORT=y
+CONFIG_MEDIA_SUPPORT=m

 #
 # Multimedia core support
@@ -3090,9 +3090,9 @@ CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
 # CONFIG_MEDIA_RADIO_SUPPORT is not set
 CONFIG_MEDIA_RC_SUPPORT=y
 CONFIG_MEDIA_CONTROLLER=y
-CONFIG_VIDEO_DEV=y
+CONFIG_VIDEO_DEV=m
 CONFIG_VIDEO_V4L2_SUBDEV_API=y
-CONFIG_VIDEO_V4L2=y
+CONFIG_VIDEO_V4L2=m
 # CONFIG_VIDEO_ADV_DEBUG is not set
 # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
 CONFIG_VIDEO_TUNER=m
@@ -3106,7 +3106,7 @@ CONFIG_VIDEOBUF2_CORE=m
 CONFIG_VIDEOBUF2_MEMOPS=m
 CONFIG_VIDEOBUF2_DMA_CONTIG=m
 CONFIG_VIDEOBUF2_VMALLOC=m
-CONFIG_DVB_CORE=y
+CONFIG_DVB_CORE=m
 CONFIG_DVB_NET=y
 CONFIG_TTPCI_EEPROM=m
 CONFIG_DVB_MAX_ADAPTERS=8
@@ -3115,7 +3115,7 @@ CONFIG_DVB_DYNAMIC_MINORS=y
 #
 # Media drivers
 #
-CONFIG_RC_CORE=y
+CONFIG_RC_CORE=m
 CONFIG_RC_MAP=m
 CONFIG_RC_DECODERS=y
 CONFIG_LIRC=m
@@ -3393,7 +3393,7 @@ CONFIG_SMS_SIANO_RC=y
 #
 CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
 CONFIG_MEDIA_ATTACH=y
-CONFIG_VIDEO_IR_I2C=y
+CONFIG_VIDEO_IR_I2C=m

 #
 # Audio decoders, processors and mixers
@@ -3480,24 +3480,24 @@ CONFIG_SOC_CAMERA_OV9640=m
 CONFIG_SOC_CAMERA_OV9740=m
 CONFIG_SOC_CAMERA_RJ54N1=m
 CONFIG_SOC_CAMERA_TW9910=m
-CONFIG_MEDIA_TUNER=y
-CONFIG_MEDIA_TUNER_SIMPLE=y
-CONFIG_MEDIA_TUNER_TDA8290=y
-CONFIG_MEDIA_TUNER_TDA827X=y
-CONFIG_MEDIA_TUNER_TDA18271=y
-CONFIG_MEDIA_TUNER_TDA9887=y
-CONFIG_MEDIA_TUNER_MT20XX=y
+CONFIG_MEDIA_TUNER=m
+CONFIG_MEDIA_TUNER_SIMPLE=m
+CONFIG_MEDIA_TUNER_TDA8290=m
+CONFIG_MEDIA_TUNER_TDA827X=m
+CONFIG_MEDIA_TUNER_TDA18271=m
+CONFIG_MEDIA_TUNER_TDA9887=m
+CONFIG_MEDIA_TUNER_MT20XX=m
 CONFIG_MEDIA_TUNER_MT2060=m
 CONFIG_MEDIA_TUNER_MT2063=m
 CONFIG_MEDIA_TUNER_MT2266=m
 CONFIG_MEDIA_TUNER_MT2131=m
 CONFIG_MEDIA_TUNER_QT1010=m
-CONFIG_MEDIA_TUNER_XC2028=y
-CONFIG_MEDIA_TUNER_XC5000=y
-CONFIG_MEDIA_TUNER_XC4000=y
+CONFIG_MEDIA_TUNER_XC2028=m
+CONFIG_MEDIA_TUNER_XC5000=m
+CONFIG_MEDIA_TUNER_XC4000=m
 CONFIG_MEDIA_TUNER_MXL5005S=m
 CONFIG_MEDIA_TUNER_MXL5007T=m
-CONFIG_MEDIA_TUNER_MC44S803=y
+CONFIG_MEDIA_TUNER_MC44S803=m
 CONFIG_MEDIA_TUNER_MAX2165=m
 CONFIG_MEDIA_TUNER_TDA18218=m
 CONFIG_MEDIA_TUNER_FC0011=m
--- a/config/kernel/kernel.config.armv5tel-ipfire-multi
+++ b/config/kernel/kernel.config.armv5tel-ipfire-multi
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.14.25 Kernel Configuration
+# Linux/arm 3.14.30 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_MIGHT_HAVE_PCI=y
@@ -2053,8 +2053,8 @@ CONFIG_IP1000=m
 CONFIG_JME=m
 CONFIG_NET_VENDOR_MARVELL=y
 CONFIG_MV643XX_ETH=m
-CONFIG_MVMDIO=m
-CONFIG_MVNETA=m
+CONFIG_MVMDIO=y
+CONFIG_MVNETA=y
 CONFIG_SKGE=m
 # CONFIG_SKGE_DEBUG is not set
 CONFIG_SKGE_GENESIS=y
@@ -2155,6 +2155,8 @@ CONFIG_XILINX_EMACLITE=m
 # CONFIG_FDDI is not set
 # CONFIG_HIPPI is not set
 CONFIG_PHYLIB=y
+CONFIG_SWCONFIG=m
+# CONFIG_SWCONFIG_LEDS is not set

 #
 # MII PHY device drivers
@@ -2178,12 +2180,17 @@ CONFIG_LSI_ET1011C_PHY=m
 CONFIG_MICREL_PHY=m
 CONFIG_FIXED_PHY=y
 CONFIG_MDIO_BITBANG=m
-# CONFIG_MDIO_GPIO is not set
+CONFIG_MDIO_GPIO=m
 CONFIG_MDIO_SUN4I=m
 CONFIG_MDIO_BUS_MUX=m
 CONFIG_MDIO_BUS_MUX_GPIO=m
 CONFIG_MDIO_BUS_MUX_MMIOREG=m
 CONFIG_GATEWORKS_GW16083=m
+CONFIG_B53=m
+CONFIG_B53_PHY_DRIVER=m
+# CONFIG_B53_MMAP_DRIVER is not set
+# CONFIG_B53_SRAB_DRIVER is not set
+CONFIG_B53_PHY_FIXUP=y
 # CONFIG_PLIP is not set
 CONFIG_PPP=m
 CONFIG_PPP_BSDCOMP=m
@@ -3330,7 +3337,7 @@ CONFIG_REGULATOR_TI_ABB=y
 # CONFIG_REGULATOR_TPS6507X is not set
 CONFIG_REGULATOR_TWL4030=y
 CONFIG_REGULATOR_VEXPRESS=m
-CONFIG_MEDIA_SUPPORT=y
+CONFIG_MEDIA_SUPPORT=m

 #
 # Multimedia core support
@@ -3341,23 +3348,23 @@ CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
 # CONFIG_MEDIA_RADIO_SUPPORT is not set
 CONFIG_MEDIA_RC_SUPPORT=y
 CONFIG_MEDIA_CONTROLLER=y
-CONFIG_VIDEO_DEV=y
+CONFIG_VIDEO_DEV=m
 CONFIG_VIDEO_V4L2_SUBDEV_API=y
-CONFIG_VIDEO_V4L2=y
+CONFIG_VIDEO_V4L2=m
 # CONFIG_VIDEO_ADV_DEBUG is not set
 # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
 CONFIG_VIDEO_TUNER=m
 CONFIG_V4L2_MEM2MEM_DEV=m
-CONFIG_VIDEOBUF_GEN=y
+CONFIG_VIDEOBUF_GEN=m
 CONFIG_VIDEOBUF_DMA_SG=m
 CONFIG_VIDEOBUF_VMALLOC=m
-CONFIG_VIDEOBUF_DMA_CONTIG=y
+CONFIG_VIDEOBUF_DMA_CONTIG=m
 CONFIG_VIDEOBUF_DVB=m
 CONFIG_VIDEOBUF2_CORE=m
 CONFIG_VIDEOBUF2_MEMOPS=m
 CONFIG_VIDEOBUF2_DMA_CONTIG=m
 CONFIG_VIDEOBUF2_VMALLOC=m
-CONFIG_DVB_CORE=y
+CONFIG_DVB_CORE=m
 CONFIG_DVB_NET=y
 CONFIG_TTPCI_EEPROM=m
 CONFIG_DVB_MAX_ADAPTERS=8
@@ -3366,7 +3373,7 @@ CONFIG_DVB_DYNAMIC_MINORS=y
 #
 # Media drivers
 #
-CONFIG_RC_CORE=y
+CONFIG_RC_CORE=m
 CONFIG_RC_MAP=m
 CONFIG_RC_DECODERS=y
 CONFIG_LIRC=m
@@ -3603,7 +3610,7 @@ CONFIG_V4L_PLATFORM_DRIVERS=y
 # CONFIG_VIDEO_CAFE_CCIC is not set
 # CONFIG_VIDEO_DM6446_CCDC is not set
 CONFIG_VIDEO_OMAP2_VOUT_VRFB=y
-CONFIG_VIDEO_OMAP2_VOUT=y
+CONFIG_VIDEO_OMAP2_VOUT=m
 CONFIG_VIDEO_TIMBERDALE=m
 CONFIG_SOC_CAMERA=m
 CONFIG_SOC_CAMERA_SCALE_CROP=m
@@ -3651,7 +3658,7 @@ CONFIG_SMS_SIANO_RC=y
 #
 CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
 CONFIG_MEDIA_ATTACH=y
-CONFIG_VIDEO_IR_I2C=y
+CONFIG_VIDEO_IR_I2C=m

 #
 # Audio decoders, processors and mixers
@@ -3737,24 +3744,24 @@ CONFIG_SOC_CAMERA_OV9640=m
 CONFIG_SOC_CAMERA_OV9740=m
 CONFIG_SOC_CAMERA_RJ54N1=m
 CONFIG_SOC_CAMERA_TW9910=m
-CONFIG_MEDIA_TUNER=y
-CONFIG_MEDIA_TUNER_SIMPLE=y
-CONFIG_MEDIA_TUNER_TDA8290=y
-CONFIG_MEDIA_TUNER_TDA827X=y
-CONFIG_MEDIA_TUNER_TDA18271=y
-CONFIG_MEDIA_TUNER_TDA9887=y
-CONFIG_MEDIA_TUNER_MT20XX=y
+CONFIG_MEDIA_TUNER=m
+CONFIG_MEDIA_TUNER_SIMPLE=m
+CONFIG_MEDIA_TUNER_TDA8290=m
+CONFIG_MEDIA_TUNER_TDA827X=m
+CONFIG_MEDIA_TUNER_TDA18271=m
+CONFIG_MEDIA_TUNER_TDA9887=m
+CONFIG_MEDIA_TUNER_MT20XX=m
 CONFIG_MEDIA_TUNER_MT2060=m
 CONFIG_MEDIA_TUNER_MT2063=m
 CONFIG_MEDIA_TUNER_MT2266=m
 CONFIG_MEDIA_TUNER_MT2131=m
 CONFIG_MEDIA_TUNER_QT1010=m
-CONFIG_MEDIA_TUNER_XC2028=y
-CONFIG_MEDIA_TUNER_XC5000=y
-CONFIG_MEDIA_TUNER_XC4000=y
+CONFIG_MEDIA_TUNER_XC2028=m
+CONFIG_MEDIA_TUNER_XC5000=m
+CONFIG_MEDIA_TUNER_XC4000=m
 CONFIG_MEDIA_TUNER_MXL5005S=m
 CONFIG_MEDIA_TUNER_MXL5007T=m
-CONFIG_MEDIA_TUNER_MC44S803=y
+CONFIG_MEDIA_TUNER_MC44S803=m
 CONFIG_MEDIA_TUNER_MAX2165=m
 CONFIG_MEDIA_TUNER_TDA18218=m
 CONFIG_MEDIA_TUNER_FC0011=m
@@ -4852,7 +4859,7 @@ CONFIG_RTC_DRV_PL030=m
 CONFIG_RTC_DRV_PL031=m
 CONFIG_RTC_DRV_VT8500=m
 CONFIG_RTC_DRV_SUNXI=y
-CONFIG_RTC_DRV_MV=m
+CONFIG_RTC_DRV_MV=y
 CONFIG_RTC_DRV_MXC=m
 CONFIG_RTC_DRV_SNVS=m
 CONFIG_RTC_DRV_MOXART=m
--- a/config/kernel/kernel.config.armv5tel-ipfire-rpi
+++ b/config/kernel/kernel.config.armv5tel-ipfire-rpi
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.14.22 Kernel Configuration
+# Linux/arm 3.14.30 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1325,7 +1325,7 @@ CONFIG_DM_DELAY=m
 # CONFIG_DM_SWITCH is not set
 # CONFIG_TARGET_CORE is not set
 CONFIG_NETDEVICES=y
-CONFIG_MII=y
+CONFIG_MII=m
 CONFIG_NET_CORE=y
 CONFIG_BONDING=m
 CONFIG_DUMMY=m
@@ -1453,7 +1453,7 @@ CONFIG_USB_KAWETH=m
 CONFIG_USB_PEGASUS=m
 CONFIG_USB_RTL8150=m
 CONFIG_USB_RTL8152=m
-CONFIG_USB_USBNET=y
+CONFIG_USB_USBNET=m
 CONFIG_USB_NET_AX8817X=m
 CONFIG_USB_NET_AX88179_178A=m
 CONFIG_USB_NET_CDCETHER=m
@@ -1465,7 +1465,7 @@ CONFIG_USB_NET_DM9601=m
 CONFIG_USB_NET_SR9700=m
 CONFIG_USB_NET_SR9800=m
 CONFIG_USB_NET_SMSC75XX=m
-CONFIG_USB_NET_SMSC95XX=y
+CONFIG_USB_NET_SMSC95XX=m
 CONFIG_USB_NET_GL620A=m
 CONFIG_USB_NET_NET1080=m
 CONFIG_USB_NET_PLUSB=m
--- a/config/kernel/kernel.config.i586-ipfire
+++ b/config/kernel/kernel.config.i586-ipfire
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.14.22 Kernel Configuration
+# Linux/x86 3.14.30 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -421,8 +421,6 @@ CONFIG_X86_MCE_THRESHOLD=y
 # CONFIG_X86_MCE_INJECT is not set
 CONFIG_X86_THERMAL_VECTOR=y
 CONFIG_VM86=y
-CONFIG_X86_16BIT=y
-CONFIG_X86_ESPFIX32=y
 CONFIG_TOSHIBA=m
 CONFIG_I8K=m
 # CONFIG_X86_REBOOTFIXUPS is not set
@@ -724,6 +722,7 @@ CONFIG_HAVE_AOUT=y
 CONFIG_BINFMT_MISC=y
 CONFIG_COREDUMP=y
 CONFIG_HAVE_ATOMIC_IOMAP=y
+CONFIG_IOSF_MBI=m
 CONFIG_NET=y

 #
--- a/config/kernel/kernel.config.i586-ipfire-pae
+++ b/config/kernel/kernel.config.i586-ipfire-pae
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.14.22 Kernel Configuration
+# Linux/x86 3.14.30 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -431,8 +431,6 @@ CONFIG_X86_MCE_THRESHOLD=y
 # CONFIG_X86_MCE_INJECT is not set
 CONFIG_X86_THERMAL_VECTOR=y
 CONFIG_VM86=y
-CONFIG_X86_16BIT=y
-CONFIG_X86_ESPFIX32=y
 CONFIG_TOSHIBA=m
 CONFIG_I8K=m
 # CONFIG_X86_REBOOTFIXUPS is not set
@@ -738,6 +736,7 @@ CONFIG_HAVE_AOUT=y
 CONFIG_BINFMT_MISC=y
 CONFIG_COREDUMP=y
 CONFIG_HAVE_ATOMIC_IOMAP=y
+CONFIG_IOSF_MBI=m
 CONFIG_NET=y

 #
@@ -3832,7 +3831,6 @@ CONFIG_DVB_TDA826X=m
 CONFIG_DVB_TUA6100=m
 CONFIG_DVB_CX24116=m
 CONFIG_DVB_CX24117=m
-CONFIG_DVB_M88DC2800=m
 CONFIG_DVB_SI21XX=m
 CONFIG_DVB_TS2020=m
 CONFIG_DVB_DS3000=m
@@ -3914,6 +3912,8 @@ CONFIG_DVB_A8293=m
 CONFIG_DVB_LGS8GXX=m
 CONFIG_DVB_ATBM8830=m
 CONFIG_DVB_TDA665x=m
+CONFIG_DVB_DVBSKY_M88DS3103=m
+CONFIG_DVB_M88DC2800=m
 CONFIG_DVB_IX2505V=m
 CONFIG_DVB_IT913X_FE=m
 CONFIG_DVB_M88RS2000=m
--- a/config/lib/firmware/brcm/brcmfmac4329-sdio.txt
+++ b/config/lib/firmware/brcm/brcmfmac4329-sdio.txt
@@ -0,0 +1,68 @@
+# bcm4329 NVRAM file for Wandboard Dual
+
+sromrev=3
+vendid=0x14e4
+devid=0x432f
+boardtype=0x53e
+
+boardrev=0x41
+
+#boardflags=0x1200
+boardflags=0x200
+
+# Specify the xtalfreq if it is otherthan 38.4MHz
+xtalfreq=37400
+
+aa2g=3
+aa5g=0
+
+ag0=255
+#tri2g=0x64
+
+# 11g paparams
+pa0b0=5542,5542,5542
+pa0b1=64244,64244,64244
+pa0b2=65202,65202,65202
+
+pa0itssit=62
+pa0maxpwr=74
+opo=0
+mcs2gpo0=0x6666
+mcs2gpo1=0x6666
+
+# 11g rssi params
+rssismf2g=0xa,0xa,0xa
+rssismc2g=0xb,0xb,0xb
+rssisav2g=0x3,0x3,0x3
+bxa2g=0
+
+# country code
+ccode=ALL
+cctl=0x0
+cckdigfilttype=0
+ofdmdigfilttype=1
+
+rxpo2g=0
+
+boardnum=1
+macaddr=DE:AD:BE:EF:00:00
+
+# xtal pu and pd time control variable
+# pu time is driver default (0x1501)
+#r13t=0x1501
+
+#######
+nocrc=1
+
+#for mfgc
+otpimagesize=182
+
+# sdio extra configs
+hwhdr=0x05ffff031030031003100000
+
+#This generates empty F1, F2 and F3 tuple chains, and may be used if the host SDIO stack does not require the standard tuples.
+#RAW1=80 02 fe ff
+
+#This includes the standard FUNCID and FUNCE tuples in the F1, F2, F3 and common CIS.
+RAW1=80 32 fe 21 02 0c 00 22 2a 01 01 00 00 c5 0 e6 00 00 00 00 00 40 00 00 ff ff 80 00 00 00 00 00 00 00 00 00 00 c8 00 00 00 00 00 00 00 00 00 00 00 00 00 ff 20 04 D0 2 29 43 21 02 0c 00 22 04 00 20 00 5A
+nvramver=4.218.214.0
--- a/config/lib/firmware/brcm/brcmfmac4330-sdio.txt
+++ b/config/lib/firmware/brcm/brcmfmac4330-sdio.txt
@@ -0,0 +1,122 @@
+# bcm4330 NVRAM file for Wandboard Quad
+
+manfid=0x2d0
+prodid=0x0532
+vendid=0x14e4
+devid=0x4360
+boardtype=0x0532
+boardrev=0x20
+boardflags=0x10080201
+
+nocrc=1
+xtalfreq=37400
+xtalmode=0x20,0x4,0
+boardnum=22
+macaddr=DE:AD:BE:EF:00:00
+ag0=252
+ag1=252
+aa2g=1
+aa5g=1
+ccode=EU
+regrev=5
+
+#for BT-coexistence
+btc_params80=0
+btc_params6=10
+btc_params8=10000
+
+sd_gpout=0
+# sd_oobonly=1
+muxenab=0x10
+
+# 2G PA param_B42R 110927
+pa0b0=0x12E4
+pa0b1=0xFE09
+pa0b2=0xFF9A
+#pa0itssit=62
+rssismf2g=0xa
+rssismc2g=0x3
+rssisav2g=0x7
+
+# rssi params for 5GHz B42R_110803
+#rssismf5g=0x4
+rssismf5g=0xa
+rssismc5g=0x7
+rssisav5g=0x1
+#PA parameters for lower band
+pa1lob0=0x144F
+pa1lob1=0xFD6B
+pa1lob2=0xFF3B
+#PA parameters for midband
+pa1b0=0x139C
+pa1b1=0xFD87
+pa1b2=0xFF4F
+#PA parameters for high band
+pa1hib0=0x12CA
+pa1hib1=0xFD9A
+pa1hib2=0xFF4E
+
+# 2G PA offset
+maxp2ga0=64
+sromrev=3
+cckpo=0
+ofdm2gpo=0x66666666
+mcs2gpo0=0xaaaa
+mcs2gpo1=0xaaaa
+
+# 5G PA offset
+maxp5ga0=66
+maxp5gla0=66
+maxp5gha0=66
+ofdm5gpo=0x22222222
+ofdm5glpo=0x11111111
+ofdm5ghpo=0x22222222
+mcs5gpo0=0x6666
+mcs5gpo1=0x6666
+mcs5glpo0=0x5555
+mcs5glpo1=0x5555
+mcs5ghpo0=0x6666
+mcs5ghpo1=0x6666
+
+cckPwrOffset=4
+cckdigfilttype=22
+ofdmdigfilttype=2
+extpagain5g=2
+#wl0id=0x431b
+
+# For 2GHz Tx EVM/SM
+rfreg033=0x19
+rfreg033_cck=0x1d
+pacalidx2g=65
+dacrate2g=160
+txalpfbyp2g=1
+bphyscale=17
+
+# 5GHz LOFT and IQ CAL
+txgaintbl5g=1
+txiqlopapu5g=1
+txiqlopag5g=0x10
+iqlocalidx5g=24
+
+# 5GHz Noise CAL parameter
+noise_cal_po_5g=5
+noise_cal_enable_5g=0
+
+# 2GHz RxPER at low rates
+noise_cal_ref_2g=56
+noise_cal_po_bias_2g=-4
+noise_cal_enable_2g=1
+
+# Max input level on a-band
+triso5g=9
+
+# Tx power control, especially temp.
+tssitime=1
+
+#fc+1.7GHz Spur Elimination
+loidacmode5g=1
+
+swctrlmap_2g=0x84048404, 0x82028202, 0x84048404, 0x010202, 0x1ff
+swctrlmap_5g=0xC040C040, 0xB030A020, 0xA020C040, 0x010A02, 0x2F8
+
+
--- a/config/lib/firmware/brcm/brcmfmac43362-sdio.txt
+++ b/config/lib/firmware/brcm/brcmfmac43362-sdio.txt
@@ -0,0 +1,58 @@
+# bcm43362 NVRAM file for LeMaker Banana Pro and Cubietruck
+#AP6210_NVRAM_V1.2_03192013
+
+manfid=0x2d0
+prodid=0x492
+vendid=0x14e4
+devid=0x4343
+boardtype=0x0598
+
+# Board Revision is P307, same nvram file can be used for P304, P305, P306 and P307 as the tssi pa params used are same
+#Please force the automatic RX PER data to the respective board directory if not using P307 board, for e.g. for P305 boards force the data into the following directory /projects/BCM43362/a1_labdata/boardtests/results/sdg_rev0305
+boardrev=0x1307
+boardnum=777
+xtalfreq=26000
+boardflags=0x80201
+boardflags2=0x80
+sromrev=3
+wl0id=0x431b
+macaddr=DE:AD:BE:EF:00:00
+aa2g=1
+ag0=2
+maxp2ga0=74
+cck2gpo=0x2222
+ofdm2gpo=0x44444444
+mcs2gpo0=0x6666
+mcs2gpo1=0x6666
+pa0maxpwr=56
+
+#P207 PA params
+#pa0b0=5447
+#pa0b1=-658
+#pa0b2=-175<div></div>
+
+#Same PA params for P304,P305, P306, P307
+
+pa0b0=5447
+pa0b1=-607
+pa0b2=-160
+pa0itssit=62
+pa1itssit=62
+
+
+cckPwrOffset=5
+ccode=0
+rssismf2g=0xa
+rssismc2g=0x3
+rssisav2g=0x7
+triso2g=0
+noise_cal_enable_2g=0
+noise_cal_po_2g=0
+swctrlmap_2g=0x04040404,0x02020202,0x02020202,0x010101,0x1ff
+temp_add=29767
+temp_mult=425
+
+btc_flags=0x6
+btc_params0=5000
+btc_params1=1000
+btc_params6=63
--- a/config/rootfiles/common/armv5tel/initscripts
+++ b/config/rootfiles/common/armv5tel/initscripts
@@ -117,6 +117,7 @@ etc/rc.d/init.d/sshd
 etc/rc.d/init.d/static-routes
 #etc/rc.d/init.d/stunnel
 etc/rc.d/init.d/swap
+etc/rc.d/init.d/swconfig
 etc/rc.d/init.d/sysctl
 etc/rc.d/init.d/sysklogd
 etc/rc.d/init.d/teamspeak
@@ -223,6 +224,7 @@ etc/rc.d/rcsysinit.d/S45udev_retry
 etc/rc.d/rcsysinit.d/S50cleanfs
 etc/rc.d/rcsysinit.d/S60setclock
 etc/rc.d/rcsysinit.d/S70console
+etc/rc.d/rcsysinit.d/S73swconfig
 etc/rc.d/rcsysinit.d/S75firstsetup
 etc/rc.d/rcsysinit.d/S80localnet
 etc/rc.d/rcsysinit.d/S85firewall
--- a/config/rootfiles/common/armv5tel/linux-kirkwood
+++ b/config/rootfiles/common/armv5tel/linux-kirkwood
@@ -548,6 +548,8 @@ lib/modules/KVER-ipfire-kirkwood
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/common/siano/smsdvb.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/common/siano/smsmdtv.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/common/tveeprom.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb-core
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb-core/dvb-core.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb-frontends
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb-frontends/a8293.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb-frontends/af9013.ko
@@ -649,6 +651,7 @@ lib/modules/KVER-ipfire-kirkwood
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/i2c/cs53l32a.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/i2c/cx25840
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/i2c/cx25840/cx25840.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/i2c/ir-kbd-i2c.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/i2c/m52790.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/i2c/msp3400.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/i2c/mt9v011.ko
@@ -684,6 +687,7 @@ lib/modules/KVER-ipfire-kirkwood
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/i2c/vp27smpx.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/i2c/wm8739.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/i2c/wm8775.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/media.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/pci
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/pci/b2c2
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/pci/b2c2/b2c2-flexcop-pci.ko
@@ -878,6 +882,7 @@ lib/modules/KVER-ipfire-kirkwood
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/rc/keymaps/rc-winfast.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/rc/lirc_dev.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/rc/mceusb.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/rc/rc-core.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/rc/rc-loopback.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/rc/redrat3.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/rc/streamzap.ko
@@ -890,8 +895,10 @@ lib/modules/KVER-ipfire-kirkwood
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/tuners/fc2580.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/tuners/m88ts2022.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/tuners/max2165.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/tuners/mc44s803.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/tuners/mt2060.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/tuners/mt2063.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/tuners/mt20xx.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/tuners/mt2131.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/tuners/mt2266.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/tuners/mxl5005s.ko
@@ -900,8 +907,17 @@ lib/modules/KVER-ipfire-kirkwood
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/tuners/r820t.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/tuners/tda18212.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/tuners/tda18218.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/tuners/tda18271.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/tuners/tda827x.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/tuners/tda8290.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/tuners/tda9887.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/tuners/tua9001.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/tuners/tuner-simple.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/tuners/tuner-types.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/tuners/tuner-xc2028.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/tuners/tuner_it913x.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/tuners/xc4000.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/tuners/xc5000.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/au0828
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/au0828/au0828.ko
@@ -1049,6 +1065,8 @@ lib/modules/KVER-ipfire-kirkwood
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/zr364xx/zr364xx.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/v4l2-core
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/v4l2-core/tuner.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/v4l2-core/v4l2-common.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/v4l2-core/v4l2-dv-timings.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/v4l2-core/v4l2-mem2mem.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/v4l2-core/videobuf-core.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/v4l2-core/videobuf-dma-contig.ko
@@ -1059,6 +1077,7 @@ lib/modules/KVER-ipfire-kirkwood
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/v4l2-core/videobuf2-dma-contig.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/v4l2-core/videobuf2-memops.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/v4l2-core/videobuf2-vmalloc.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/v4l2-core/videodev.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/memstick
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/memstick/core
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/memstick/core/memstick.ko
--- a/config/rootfiles/common/armv5tel/linux-multi
+++ b/config/rootfiles/common/armv5tel/linux-multi
@@ -110,8 +110,10 @@ boot/dtb-KVER-ipfire-multi
 #boot/dtb-KVER-ipfire-multi/sun5i-a13-olinuxino.dtb
 #boot/dtb-KVER-ipfire-multi/sun6i-a31-colombus.dtb
 #boot/dtb-KVER-ipfire-multi/sun7i-a20-bananapi.dtb
+#boot/dtb-KVER-ipfire-multi/sun7i-a20-bananapro.dtb
 #boot/dtb-KVER-ipfire-multi/sun7i-a20-cubieboard2.dtb
 #boot/dtb-KVER-ipfire-multi/sun7i-a20-cubietruck.dtb
+#boot/dtb-KVER-ipfire-multi/sun7i-a20-lamobo-r1.dtb
 #boot/dtb-KVER-ipfire-multi/sun7i-a20-olinuxino-micro.dtb
 #boot/dtb-KVER-ipfire-multi/sun7i-a20-pcduino3.dtb
 #boot/dtb-KVER-ipfire-multi/vexpress-v2p-ca15-tc1.dtb
@@ -596,6 +598,8 @@ lib/modules/KVER-ipfire-multi
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/common/siano/smsdvb.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/common/siano/smsmdtv.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/common/tveeprom.ko
+#lib/modules/KVER-ipfire-multi/kernel/drivers/media/dvb-core
+#lib/modules/KVER-ipfire-multi/kernel/drivers/media/dvb-core/dvb-core.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/dvb-frontends
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/dvb-frontends/a8293.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/dvb-frontends/af9013.ko
@@ -694,6 +698,7 @@ lib/modules/KVER-ipfire-multi
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/i2c/cs53l32a.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/i2c/cx25840
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/i2c/cx25840/cx25840.ko
+#lib/modules/KVER-ipfire-multi/kernel/drivers/media/i2c/ir-kbd-i2c.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/i2c/m52790.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/i2c/msp3400.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/i2c/mt9v011.ko
@@ -728,6 +733,7 @@ lib/modules/KVER-ipfire-multi
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/i2c/vp27smpx.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/i2c/wm8739.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/i2c/wm8775.ko
+#lib/modules/KVER-ipfire-multi/kernel/drivers/media/media.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/pci
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/pci/b2c2
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/pci/b2c2/b2c2-flexcop-pci.ko
@@ -793,6 +799,8 @@ lib/modules/KVER-ipfire-multi
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/pci/ttpci/ttpci-eeprom.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/platform
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/platform/m2m-deinterlace.ko
+#lib/modules/KVER-ipfire-multi/kernel/drivers/media/platform/omap
+#lib/modules/KVER-ipfire-multi/kernel/drivers/media/platform/omap/omap-vout.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/platform/sh_veu.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/platform/soc_camera
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/platform/soc_camera/mx3_camera.ko
@@ -925,6 +933,7 @@ lib/modules/KVER-ipfire-multi
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/rc/keymaps/rc-winfast.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/rc/lirc_dev.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/rc/mceusb.ko
+#lib/modules/KVER-ipfire-multi/kernel/drivers/media/rc/rc-core.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/rc/rc-loopback.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/rc/redrat3.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/rc/streamzap.ko
@@ -938,8 +947,10 @@ lib/modules/KVER-ipfire-multi
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/tuners/fc2580.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/tuners/m88ts2022.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/tuners/max2165.ko
+#lib/modules/KVER-ipfire-multi/kernel/drivers/media/tuners/mc44s803.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/tuners/mt2060.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/tuners/mt2063.ko
+#lib/modules/KVER-ipfire-multi/kernel/drivers/media/tuners/mt20xx.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/tuners/mt2131.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/tuners/mt2266.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/tuners/mxl5005s.ko
@@ -948,8 +959,17 @@ lib/modules/KVER-ipfire-multi
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/tuners/r820t.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/tuners/tda18212.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/tuners/tda18218.ko
+#lib/modules/KVER-ipfire-multi/kernel/drivers/media/tuners/tda18271.ko
+#lib/modules/KVER-ipfire-multi/kernel/drivers/media/tuners/tda827x.ko
+#lib/modules/KVER-ipfire-multi/kernel/drivers/media/tuners/tda8290.ko
+#lib/modules/KVER-ipfire-multi/kernel/drivers/media/tuners/tda9887.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/tuners/tua9001.ko
+#lib/modules/KVER-ipfire-multi/kernel/drivers/media/tuners/tuner-simple.ko
+#lib/modules/KVER-ipfire-multi/kernel/drivers/media/tuners/tuner-types.ko
+#lib/modules/KVER-ipfire-multi/kernel/drivers/media/tuners/tuner-xc2028.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/tuners/tuner_it913x.ko
+#lib/modules/KVER-ipfire-multi/kernel/drivers/media/tuners/xc4000.ko
+#lib/modules/KVER-ipfire-multi/kernel/drivers/media/tuners/xc5000.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/usb
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/usb/au0828
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/usb/au0828/au0828.ko
@@ -1092,7 +1112,11 @@ lib/modules/KVER-ipfire-multi
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/usb/zr364xx/zr364xx.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/v4l2-core
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/v4l2-core/tuner.ko
+#lib/modules/KVER-ipfire-multi/kernel/drivers/media/v4l2-core/v4l2-common.ko
+#lib/modules/KVER-ipfire-multi/kernel/drivers/media/v4l2-core/v4l2-dv-timings.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/v4l2-core/v4l2-mem2mem.ko
+#lib/modules/KVER-ipfire-multi/kernel/drivers/media/v4l2-core/videobuf-core.ko
+#lib/modules/KVER-ipfire-multi/kernel/drivers/media/v4l2-core/videobuf-dma-contig.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/v4l2-core/videobuf-dma-sg.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/v4l2-core/videobuf-dvb.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/v4l2-core/videobuf-vmalloc.ko
@@ -1100,6 +1124,7 @@ lib/modules/KVER-ipfire-multi
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/v4l2-core/videobuf2-dma-contig.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/v4l2-core/videobuf2-memops.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/v4l2-core/videobuf2-vmalloc.ko
+#lib/modules/KVER-ipfire-multi/kernel/drivers/media/v4l2-core/videodev.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/memstick
 #lib/modules/KVER-ipfire-multi/kernel/drivers/memstick/core
 #lib/modules/KVER-ipfire-multi/kernel/drivers/memstick/core/memstick.ko
@@ -1261,8 +1286,6 @@ lib/modules/KVER-ipfire-multi
 #lib/modules/KVER-ipfire-multi/kernel/drivers/net/ethernet/jme.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/net/ethernet/marvell
 #lib/modules/KVER-ipfire-multi/kernel/drivers/net/ethernet/marvell/mv643xx_eth.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/net/ethernet/marvell/mvmdio.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/net/ethernet/marvell/mvneta.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/net/ethernet/marvell/skge.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/net/ethernet/marvell/sky2.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/net/ethernet/mellanox
@@ -1352,6 +1375,9 @@ lib/modules/KVER-ipfire-multi
 #lib/modules/KVER-ipfire-multi/kernel/drivers/net/phy
 #lib/modules/KVER-ipfire-multi/kernel/drivers/net/phy/amd.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/net/phy/at803x.ko
+#lib/modules/KVER-ipfire-multi/kernel/drivers/net/phy/b53
+#lib/modules/KVER-ipfire-multi/kernel/drivers/net/phy/b53/b53_common.ko
+#lib/modules/KVER-ipfire-multi/kernel/drivers/net/phy/b53/b53_mdio.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/net/phy/bcm87xx.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/net/phy/broadcom.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/net/phy/cicada.ko
@@ -1362,6 +1388,7 @@ lib/modules/KVER-ipfire-multi
 #lib/modules/KVER-ipfire-multi/kernel/drivers/net/phy/lxt.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/net/phy/marvell.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/net/phy/mdio-bitbang.ko
+#lib/modules/KVER-ipfire-multi/kernel/drivers/net/phy/mdio-gpio.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/net/phy/mdio-mux-gpio.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/net/phy/mdio-mux-mmioreg.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/net/phy/mdio-mux.ko
@@ -1372,6 +1399,7 @@ lib/modules/KVER-ipfire-multi
 #lib/modules/KVER-ipfire-multi/kernel/drivers/net/phy/realtek.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/net/phy/smsc.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/net/phy/ste10Xp.ko
+#lib/modules/KVER-ipfire-multi/kernel/drivers/net/phy/swconfig.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/net/phy/vitesse.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/net/ppp
 #lib/modules/KVER-ipfire-multi/kernel/drivers/net/ppp/bsd_comp.ko
@@ -1605,7 +1633,6 @@ lib/modules/KVER-ipfire-multi
 #lib/modules/KVER-ipfire-multi/kernel/drivers/rtc/rtc-max6900.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/rtc/rtc-moxart.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/rtc/rtc-msm6242.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/rtc/rtc-mv.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/rtc/rtc-mxc.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/rtc/rtc-pcf2127.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/rtc/rtc-pcf8523.ko
@@ -2684,4 +2711,5 @@ lib/modules/KVER-ipfire-multi
 #lib/modules/KVER-ipfire-multi/modules.symbols
 #lib/modules/KVER-ipfire-multi/modules.symbols.bin
 #lib/modules/KVER-ipfire-multi/source
+usr/include/linux/switch.h
 boot/uInit-ipfire-multi
--- a/config/rootfiles/common/armv5tel/linux-rpi
+++ b/config/rootfiles/common/armv5tel/linux-rpi
@@ -778,6 +778,7 @@ lib/modules/KVER-ipfire-rpi
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/ifb.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/imq.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/macvlan.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/mii.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/netconsole.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/phy
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/phy/libphy.ko
@@ -824,8 +825,10 @@ lib/modules/KVER-ipfire-rpi
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/usb/rtl8150.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/usb/sierra_net.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/usb/smsc75xx.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/usb/smsc95xx.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/usb/sr9700.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/usb/sr9800.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/usb/usbnet.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/usb/zaurus.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/veth.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/wireless
--- a/config/rootfiles/common/armv5tel/swconfig
+++ b/config/rootfiles/common/armv5tel/swconfig
@@ -0,0 +1 @@
+usr/bin/swconfig
--- a/config/rootfiles/common/armv5tel/u-boot
+++ b/config/rootfiles/common/armv5tel/u-boot
@@ -1,16 +1,16 @@
 #boot/MLO
-boot/boot.scr
-boot/boot.script
-boot/convert_bootscript
 #boot/u-boot.img
+boot/uEnv.txt
 usr/bin/mkimage
 #usr/share/u-boot
+#usr/share/u-boot/banana_pi
+usr/share/u-boot/banana_pi/u-boot-sunxi-with-spl.bin
 #usr/share/u-boot/pandaboard
-#usr/share/u-boot/pandaboard/MLO
-#usr/share/u-boot/pandaboard/u-boot.img
+usr/share/u-boot/pandaboard/MLO
+usr/share/u-boot/pandaboard/u-boot.img
 #usr/share/u-boot/wandboard_dl
-#usr/share/u-boot/wandboard_dl/u-boot.imx
+usr/share/u-boot/wandboard_dl/u-boot.imx
 #usr/share/u-boot/wandboard_quad
-#usr/share/u-boot/wandboard_quad/u-boot.imx
+usr/share/u-boot/wandboard_quad/u-boot.imx
 #usr/share/u-boot/wandboard_solo
-#usr/share/u-boot/wandboard_solo/u-boot.imx
+usr/share/u-boot/wandboard_solo/u-boot.imx
--- a/config/rootfiles/common/armv5tel/util-linux
+++ b/config/rootfiles/common/armv5tel/util-linux
@@ -74,7 +74,7 @@ usr/bin/renice
 #usr/bin/setarch
 usr/bin/setsid
 #usr/bin/setterm
-#usr/bin/tailf
+usr/bin/tailf
 #usr/bin/taskset
 #usr/bin/ul
 #usr/bin/unshare
--- a/config/rootfiles/common/crda
+++ b/config/rootfiles/common/crda
@@ -3,10 +3,12 @@ lib/udev/rules.d/85-regulatory.rules
 #root/.python-eggs/M2Crypto-0.21.1-py2.7-linux-MACHINE.egg-tmp
 #root/.python-eggs/M2Crypto-0.21.1-py2.7-linux-MACHINE.egg-tmp/M2Crypto
 #root/.python-eggs/M2Crypto-0.21.1-py2.7-linux-MACHINE.egg-tmp/M2Crypto/__m2crypto.so
-#root/.python-eggs/M2Crypto-0.21.1-py2.7-linux-i686.egg-tmp
-#root/.python-eggs/M2Crypto-0.21.1-py2.7-linux-i686.egg-tmp/M2Crypto
-#root/.python-eggs/M2Crypto-0.21.1-py2.7-linux-i686.egg-tmp/M2Crypto/__m2crypto.so
 sbin/crda
 sbin/regdbdump
+#usr/include/reglib
+#usr/include/reglib/nl80211.h
+#usr/include/reglib/regdb.h
+#usr/include/reglib/reglib.h
+usr/lib/libreg.so
 #usr/share/man/man8/crda.8.gz
 #usr/share/man/man8/regdbdump.8.gz
--- a/config/rootfiles/common/dvb-firmwares
+++ b/config/rootfiles/common/dvb-firmwares
@@ -1,4 +1,7 @@
 lib/firmware/dvb-fe-bcm3510-01.fw
+lib/firmware/dvb-fe-drxj-mc-1.0.8.fw
+lib/firmware/dvb-fe-drxj-mc-vsb-1.0.8.fw
+lib/firmware/dvb-fe-drxj-mc-vsb-qam-1.0.8.fw
 lib/firmware/dvb-fe-or51132-qam.fw
 lib/firmware/dvb-fe-or51132-vsb.fw
 lib/firmware/dvb-fe-or51211.fw
@@ -21,4 +24,4 @@ lib/firmware/dvb-usb-vp702x-01.fw
 lib/firmware/dvb-usb-vp7045-01.fw
 lib/firmware/dvb-usb-wt220u-01.fw
 lib/firmware/dvb-usb-wt220u-02.fw
-lib/firmware/v4l-cx23885-enc.fw
+lib/firmware/v4l-cx23885-enc-broken.fw
--- a/config/rootfiles/common/i586/util-linux
+++ b/config/rootfiles/common/i586/util-linux
@@ -75,7 +75,7 @@ usr/bin/renice
 #usr/bin/setarch
 usr/bin/setsid
 #usr/bin/setterm
-#usr/bin/tailf
+usr/bin/tailf
 #usr/bin/taskset
 #usr/bin/ul
 #usr/bin/unshare
--- a/config/rootfiles/common/installer
+++ b/config/rootfiles/common/installer
@@ -1,7 +1,7 @@
 #usr/bin/downloadsource.sh
 #usr/bin/execute-postinstall.sh
-#usr/bin/start-networking.sh
 #usr/bin/installer
+#usr/bin/start-networking.sh
 #usr/lib/dracut/modules.d/99installer
 #usr/lib/dracut/modules.d/99installer/70-dhcpcd.exe
 #usr/lib/dracut/modules.d/99installer/fake-root.sh
@@ -16,10 +16,13 @@
 #usr/share/locale/es/LC_MESSAGES/installer.mo
 #usr/share/locale/fa/LC_MESSAGES/installer.mo
 #usr/share/locale/fr/LC_MESSAGES/installer.mo
+#usr/share/locale/hr/LC_MESSAGES/installer.mo
 #usr/share/locale/hu/LC_MESSAGES/installer.mo
 #usr/share/locale/id/LC_MESSAGES/installer.mo
 #usr/share/locale/it/LC_MESSAGES/installer.mo
 #usr/share/locale/ja/LC_MESSAGES/installer.mo
+#usr/share/locale/ja_JP/LC_MESSAGES/installer.mo
+#usr/share/locale/jv/LC_MESSAGES/installer.mo
 #usr/share/locale/km_KH/LC_MESSAGES/installer.mo
 #usr/share/locale/nl/LC_MESSAGES/installer.mo
 #usr/share/locale/pl/LC_MESSAGES/installer.mo
@@ -27,8 +30,12 @@
 #usr/share/locale/pt_PT/LC_MESSAGES/installer.mo
 #usr/share/locale/ro_RO/LC_MESSAGES/installer.mo
 #usr/share/locale/ru/LC_MESSAGES/installer.mo
+#usr/share/locale/ru_RU/LC_MESSAGES/installer.mo
+#usr/share/locale/rw/LC_MESSAGES/installer.mo
 #usr/share/locale/sk/LC_MESSAGES/installer.mo
 #usr/share/locale/sq/LC_MESSAGES/installer.mo
+#usr/share/locale/sr/LC_MESSAGES/installer.mo
+#usr/share/locale/su/LC_MESSAGES/installer.mo
 #usr/share/locale/sv/LC_MESSAGES/installer.mo
 #usr/share/locale/th/LC_MESSAGES/installer.mo
 #usr/share/locale/tk/LC_MESSAGES/installer.mo
--- a/config/rootfiles/common/kbd
+++ b/config/rootfiles/common/kbd
@@ -137,6 +137,7 @@ lib/kbd/consolefonts/iso07u-16.psfu.gz
 #lib/kbd/consolefonts/lat0-12.psfu.gz
 #lib/kbd/consolefonts/lat0-14.psfu.gz
 lib/kbd/consolefonts/lat0-16.psfu.gz
+lib/kbd/consolefonts/lat0-sun16.psfu.gz
 #lib/kbd/consolefonts/lat1-08.psfu.gz
 #lib/kbd/consolefonts/lat1-10.psfu.gz
 #lib/kbd/consolefonts/lat1-12.psfu.gz
@@ -147,6 +148,7 @@ lib/kbd/consolefonts/lat1-16.psfu.gz
 #lib/kbd/consolefonts/lat2-12.psfu.gz
 #lib/kbd/consolefonts/lat2-14.psfu.gz
 lib/kbd/consolefonts/lat2-16.psfu.gz
+lib/kbd/consolefonts/lat2-sun16.psfu.gz
 #lib/kbd/consolefonts/lat2a-16.psfu.gz
 #lib/kbd/consolefonts/lat4-08.psfu.gz
 #lib/kbd/consolefonts/lat4-10.psfu.gz
@@ -188,6 +190,7 @@ lib/kbd/consolefonts/lat5-16.psfu.gz
 #lib/kbd/consolefonts/lat9w-12.psfu.gz
 #lib/kbd/consolefonts/lat9w-14.psfu.gz
 #lib/kbd/consolefonts/lat9w-16.psfu.gz
+lib/kbd/consolefonts/latarcyrheb-sun16.psfu.gz
 #lib/kbd/consolefonts/partialfonts
 #lib/kbd/consolefonts/partialfonts/8859-1.a0-ff.08.gz
 #lib/kbd/consolefonts/partialfonts/8859-1.a0-ff.14.gz
--- a/config/rootfiles/common/linux-firmware
+++ b/config/rootfiles/common/linux-firmware
@@ -2,6 +2,8 @@
 lib/firmware/3com/3C359.bin
 lib/firmware/3com/typhoon.bin
 lib/firmware/GPL-3
+lib/firmware/LICENCE.Abilis
+lib/firmware/LICENCE.IntcSST2
 lib/firmware/LICENCE.Marvell
 lib/firmware/LICENCE.OLPC
 lib/firmware/LICENCE.agere
@@ -11,23 +13,30 @@ lib/firmware/LICENCE.ca0132
 lib/firmware/LICENCE.chelsio_firmware
 lib/firmware/LICENCE.cw1200
 lib/firmware/LICENCE.ene_firmware
+lib/firmware/LICENCE.fw_sst_0f28
 lib/firmware/LICENCE.go7007
 lib/firmware/LICENCE.i2400m
 lib/firmware/LICENCE.ibt_firmware
+lib/firmware/LICENCE.it913x
 lib/firmware/LICENCE.iwlwifi_firmware
 lib/firmware/LICENCE.mwl8335
 lib/firmware/LICENCE.myri10ge_firmware
 lib/firmware/LICENCE.phanfw
+lib/firmware/LICENCE.qat_dh895xcc_firmware
 lib/firmware/LICENCE.qla2xxx
+lib/firmware/LICENCE.r8a779x_usb3
 lib/firmware/LICENCE.ralink-firmware.txt
 lib/firmware/LICENCE.ralink_a_mediatek_company_firmware
 lib/firmware/LICENCE.rtlwifi_firmware.txt
+lib/firmware/LICENCE.siano
 lib/firmware/LICENCE.tda7706-firmware.txt
 lib/firmware/LICENCE.ti-connectivity
 lib/firmware/LICENCE.ueagle-atm4-firmware
 lib/firmware/LICENCE.via_vt6656
 lib/firmware/LICENCE.wl1251
+lib/firmware/LICENCE.xc4000
 lib/firmware/LICENCE.xc5000
+lib/firmware/LICENCE.xc5000c
 lib/firmware/LICENSE.amd-ucode
 lib/firmware/LICENSE.dib0700
 lib/firmware/LICENSE.radeon
@@ -58,6 +67,8 @@ lib/firmware/amd-ucode/microcode_amd.bin
 lib/firmware/amd-ucode/microcode_amd.bin.asc
 lib/firmware/amd-ucode/microcode_amd_fam15h.bin
 lib/firmware/amd-ucode/microcode_amd_fam15h.bin.asc
+lib/firmware/amd-ucode/microcode_amd_fam16h.bin
+lib/firmware/amd-ucode/microcode_amd_fam16h.bin.asc
 #lib/firmware/ar3k
 #lib/firmware/ar3k/1020200
 lib/firmware/ar3k/1020200/PS_ASIC.pst
@@ -100,6 +111,8 @@ lib/firmware/ar7010_1_1.fw
 lib/firmware/ar9170-1.fw
 lib/firmware/ar9170-2.fw
 lib/firmware/ar9271.fw
+lib/firmware/as102_data1_st.hex
+lib/firmware/as102_data2_st.hex
 lib/firmware/ath3k-1.fw
 #lib/firmware/ath6k
 #lib/firmware/ath6k/AR6002
@@ -191,9 +204,11 @@ 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.10.51.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.17.0.fw
+lib/firmware/bnx2x/bnx2x-e1-7.8.19.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
@@ -201,9 +216,11 @@ 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.10.51.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.17.0.fw
+lib/firmware/bnx2x/bnx2x-e1h-7.8.19.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
@@ -211,14 +228,18 @@ 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.10.51.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.17.0.fw
+lib/firmware/bnx2x/bnx2x-e2-7.8.19.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/bcm43xx-0.fw
 lib/firmware/brcm/bcm43xx_hdr-0.fw
+lib/firmware/brcm/brcmfmac43143-sdio.bin
+lib/firmware/brcm/brcmfmac43143.bin
 lib/firmware/brcm/brcmfmac43236b.bin
 lib/firmware/brcm/brcmfmac43241b0-sdio.bin
 lib/firmware/brcm/brcmfmac43241b4-sdio.bin
@@ -226,6 +247,8 @@ lib/firmware/brcm/brcmfmac4329-sdio.bin
 lib/firmware/brcm/brcmfmac4330-sdio.bin
 lib/firmware/brcm/brcmfmac4334-sdio.bin
 lib/firmware/brcm/brcmfmac4335-sdio.bin
+lib/firmware/brcm/brcmfmac43362-sdio.bin
+lib/firmware/brcm/brcmfmac4354-sdio.bin
 lib/firmware/carl9170-1.fw
 #lib/firmware/carl9170fw
 #lib/firmware/carl9170fw/CMakeLists.txt
@@ -391,6 +414,8 @@ 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/cmmb_vega_12mhz.inp
+lib/firmware/cmmb_venice_12mhz.inp
 #lib/firmware/configure
 #lib/firmware/cpia2
 lib/firmware/cpia2/stv0672_vp4.bin
@@ -412,9 +437,9 @@ 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.9.23.0.bin
+lib/firmware/cxgb4/t4fw-1.12.25.0.bin
 lib/firmware/cxgb4/t4fw.bin
-lib/firmware/cxgb4/t5fw-1.9.23.0.bin
+lib/firmware/cxgb4/t5fw-1.12.25.0.bin
 lib/firmware/cxgb4/t5fw.bin
 #lib/firmware/dabusb
 lib/firmware/dabusb/bitstream.bin
@@ -424,9 +449,15 @@ lib/firmware/dabusb/firmware.fw
 #lib/firmware/dsp56k/bootstrap.asm
 lib/firmware/dsp56k/bootstrap.bin
 #lib/firmware/dsp56k/concat-bootstrap.pl
+lib/firmware/dvb-fe-xc4000-1.4.1.fw
 lib/firmware/dvb-fe-xc5000-1.6.114.fw
+lib/firmware/dvb-fe-xc5000c-4.1.30.7.fw
 lib/firmware/dvb-usb-dib0700-1.20.fw
+lib/firmware/dvb-usb-it9135-01.fw
+lib/firmware/dvb-usb-it9135-02.fw
 lib/firmware/dvb-usb-terratec-h5-drxk.fw
+lib/firmware/dvb_nova_12mhz.inp
+lib/firmware/dvb_nova_12mhz_b0.inp
 #lib/firmware/e100
 lib/firmware/e100/d101m_ucode.bin
 lib/firmware/e100/d101s_ucode.bin
@@ -472,9 +503,17 @@ 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/intel
+lib/firmware/intel/IntcSST2.bin
+lib/firmware/intel/fw_sst_0f28.bin
+lib/firmware/intel/fw_sst_0f28.bin-48kHz_i2s_master
+lib/firmware/intel/ibt-hw-37.7.10-fw-1.0.1.2d.d.bseq
 lib/firmware/intel/ibt-hw-37.7.10-fw-1.0.2.3.d.bseq
+lib/firmware/intel/ibt-hw-37.7.10-fw-1.80.1.2d.d.bseq
 lib/firmware/intel/ibt-hw-37.7.10-fw-1.80.2.3.d.bseq
 lib/firmware/intel/ibt-hw-37.7.bseq
+lib/firmware/intel/ibt-hw-37.8.10-fw-1.10.2.27.d.bseq
+lib/firmware/intel/ibt-hw-37.8.10-fw-1.10.3.11.e.bseq
+lib/firmware/intel/ibt-hw-37.8.bseq
 lib/firmware/intelliport2.bin
 #lib/firmware/isci
 #lib/firmware/isci/Makefile
@@ -483,6 +522,9 @@ lib/firmware/isci/README
 #lib/firmware/isci/create_fw.h
 lib/firmware/isci/isci_firmware.bin
 #lib/firmware/isci/probe_roms.h
+lib/firmware/isdbt_nova_12mhz.inp
+lib/firmware/isdbt_nova_12mhz_b0.inp
+lib/firmware/isdbt_rio.inp
 lib/firmware/iwlwifi-100-5.ucode
 lib/firmware/iwlwifi-1000-3.ucode
 lib/firmware/iwlwifi-1000-5.ucode
@@ -490,7 +532,10 @@ 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-3160-10.ucode
 lib/firmware/iwlwifi-3160-7.ucode
+lib/firmware/iwlwifi-3160-8.ucode
+lib/firmware/iwlwifi-3160-9.ucode
 lib/firmware/iwlwifi-3945-2.ucode
 lib/firmware/iwlwifi-4965-2.ucode
 lib/firmware/iwlwifi-5000-1.ucode
@@ -504,7 +549,14 @@ 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/iwlwifi-7260-10.ucode
 lib/firmware/iwlwifi-7260-7.ucode
+lib/firmware/iwlwifi-7260-8.ucode
+lib/firmware/iwlwifi-7260-9.ucode
+lib/firmware/iwlwifi-7265-10.ucode
+lib/firmware/iwlwifi-7265-8.ucode
+lib/firmware/iwlwifi-7265-9.ucode
+lib/firmware/iwlwifi-7265D-10.ucode
 #lib/firmware/kaweth
 lib/firmware/kaweth/new_code.bin
 lib/firmware/kaweth/new_code_fix.bin
@@ -595,15 +647,20 @@ lib/firmware/mwl8k/fmimage_8687.fw
 lib/firmware/mwl8k/fmimage_8764_ap-1.fw
 lib/firmware/mwl8k/helper_8366.fw
 lib/firmware/mwl8k/helper_8687.fw
+lib/firmware/myri10ge_eth_big_z8e.dat
 lib/firmware/myri10ge_eth_z8e.dat
+lib/firmware/myri10ge_ethp_big_z8e.dat
 lib/firmware/myri10ge_ethp_z8e.dat
+lib/firmware/myri10ge_rss_eth_big_z8e.dat
 lib/firmware/myri10ge_rss_eth_z8e.dat
+lib/firmware/myri10ge_rss_ethp_big_z8e.dat
 lib/firmware/myri10ge_rss_ethp_z8e.dat
 #lib/firmware/myricom
 lib/firmware/myricom/lanai.bin
 #lib/firmware/ositech
 lib/firmware/ositech/Xilinx7OD.bin
 lib/firmware/phanfw.bin
+lib/firmware/qat_895xcc.bin
 lib/firmware/ql2100_fw.bin
 lib/firmware/ql2200_fw.bin
 lib/firmware/ql2300_fw.bin
@@ -618,6 +675,7 @@ lib/firmware/qlogic/isp1000.bin
 lib/firmware/qlogic/sd7220.fw
 #lib/firmware/r128
 lib/firmware/r128/r128_cce.bin
+lib/firmware/r8a779x_usb3_v1.dlmem
 #lib/firmware/radeon
 lib/firmware/radeon/ARUBA_me.bin
 lib/firmware/radeon/ARUBA_pfp.bin
@@ -628,6 +686,7 @@ lib/firmware/radeon/BARTS_pfp.bin
 lib/firmware/radeon/BARTS_smc.bin
 lib/firmware/radeon/BONAIRE_ce.bin
 lib/firmware/radeon/BONAIRE_mc.bin
+lib/firmware/radeon/BONAIRE_mc2.bin
 lib/firmware/radeon/BONAIRE_me.bin
 lib/firmware/radeon/BONAIRE_mec.bin
 lib/firmware/radeon/BONAIRE_pfp.bin
@@ -635,6 +694,7 @@ lib/firmware/radeon/BONAIRE_rlc.bin
 lib/firmware/radeon/BONAIRE_sdma.bin
 lib/firmware/radeon/BONAIRE_smc.bin
 lib/firmware/radeon/BONAIRE_uvd.bin
+lib/firmware/radeon/BONAIRE_vce.bin
 lib/firmware/radeon/BTC_rlc.bin
 lib/firmware/radeon/CAICOS_mc.bin
 lib/firmware/radeon/CAICOS_me.bin
@@ -656,10 +716,20 @@ lib/firmware/radeon/CYPRESS_smc.bin
 lib/firmware/radeon/CYPRESS_uvd.bin
 lib/firmware/radeon/HAINAN_ce.bin
 lib/firmware/radeon/HAINAN_mc.bin
+lib/firmware/radeon/HAINAN_mc2.bin
 lib/firmware/radeon/HAINAN_me.bin
 lib/firmware/radeon/HAINAN_pfp.bin
 lib/firmware/radeon/HAINAN_rlc.bin
 lib/firmware/radeon/HAINAN_smc.bin
+lib/firmware/radeon/HAWAII_ce.bin
+lib/firmware/radeon/HAWAII_mc.bin
+lib/firmware/radeon/HAWAII_mc2.bin
+lib/firmware/radeon/HAWAII_me.bin
+lib/firmware/radeon/HAWAII_mec.bin
+lib/firmware/radeon/HAWAII_pfp.bin
+lib/firmware/radeon/HAWAII_rlc.bin
+lib/firmware/radeon/HAWAII_sdma.bin
+lib/firmware/radeon/HAWAII_smc.bin
 lib/firmware/radeon/JUNIPER_me.bin
 lib/firmware/radeon/JUNIPER_pfp.bin
 lib/firmware/radeon/JUNIPER_rlc.bin
@@ -676,8 +746,15 @@ lib/firmware/radeon/KAVERI_mec.bin
 lib/firmware/radeon/KAVERI_pfp.bin
 lib/firmware/radeon/KAVERI_rlc.bin
 lib/firmware/radeon/KAVERI_sdma.bin
+lib/firmware/radeon/MULLINS_ce.bin
+lib/firmware/radeon/MULLINS_me.bin
+lib/firmware/radeon/MULLINS_mec.bin
+lib/firmware/radeon/MULLINS_pfp.bin
+lib/firmware/radeon/MULLINS_rlc.bin
+lib/firmware/radeon/MULLINS_sdma.bin
 lib/firmware/radeon/OLAND_ce.bin
 lib/firmware/radeon/OLAND_mc.bin
+lib/firmware/radeon/OLAND_mc2.bin
 lib/firmware/radeon/OLAND_me.bin
 lib/firmware/radeon/OLAND_pfp.bin
 lib/firmware/radeon/OLAND_rlc.bin
@@ -686,6 +763,7 @@ 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_mc2.bin
 lib/firmware/radeon/PITCAIRN_me.bin
 lib/firmware/radeon/PITCAIRN_pfp.bin
 lib/firmware/radeon/PITCAIRN_rlc.bin
@@ -698,6 +776,7 @@ lib/firmware/radeon/R520_cp.bin
 lib/firmware/radeon/R600_me.bin
 lib/firmware/radeon/R600_pfp.bin
 lib/firmware/radeon/R600_rlc.bin
+lib/firmware/radeon/R600_uvd.bin
 lib/firmware/radeon/R700_rlc.bin
 lib/firmware/radeon/REDWOOD_me.bin
 lib/firmware/radeon/REDWOOD_pfp.bin
@@ -707,6 +786,7 @@ lib/firmware/radeon/RS600_cp.bin
 lib/firmware/radeon/RS690_cp.bin
 lib/firmware/radeon/RS780_me.bin
 lib/firmware/radeon/RS780_pfp.bin
+lib/firmware/radeon/RS780_uvd.bin
 lib/firmware/radeon/RV610_me.bin
 lib/firmware/radeon/RV610_pfp.bin
 lib/firmware/radeon/RV620_me.bin
@@ -728,6 +808,7 @@ lib/firmware/radeon/RV740_smc.bin
 lib/firmware/radeon/RV770_me.bin
 lib/firmware/radeon/RV770_pfp.bin
 lib/firmware/radeon/RV770_smc.bin
+lib/firmware/radeon/RV770_uvd.bin
 lib/firmware/radeon/SUMO2_me.bin
 lib/firmware/radeon/SUMO2_pfp.bin
 lib/firmware/radeon/SUMO_me.bin
@@ -736,6 +817,7 @@ lib/firmware/radeon/SUMO_rlc.bin
 lib/firmware/radeon/SUMO_uvd.bin
 lib/firmware/radeon/TAHITI_ce.bin
 lib/firmware/radeon/TAHITI_mc.bin
+lib/firmware/radeon/TAHITI_mc2.bin
 lib/firmware/radeon/TAHITI_me.bin
 lib/firmware/radeon/TAHITI_pfp.bin
 lib/firmware/radeon/TAHITI_rlc.bin
@@ -747,11 +829,78 @@ lib/firmware/radeon/TURKS_pfp.bin
 lib/firmware/radeon/TURKS_smc.bin
 lib/firmware/radeon/VERDE_ce.bin
 lib/firmware/radeon/VERDE_mc.bin
+lib/firmware/radeon/VERDE_mc2.bin
 lib/firmware/radeon/VERDE_me.bin
 lib/firmware/radeon/VERDE_pfp.bin
 lib/firmware/radeon/VERDE_rlc.bin
 lib/firmware/radeon/VERDE_smc.bin
+lib/firmware/radeon/bonaire_ce.bin
+lib/firmware/radeon/bonaire_mc.bin
+lib/firmware/radeon/bonaire_me.bin
+lib/firmware/radeon/bonaire_mec.bin
+lib/firmware/radeon/bonaire_pfp.bin
+lib/firmware/radeon/bonaire_rlc.bin
+lib/firmware/radeon/bonaire_sdma.bin
+lib/firmware/radeon/bonaire_smc.bin
+lib/firmware/radeon/hainan_ce.bin
+lib/firmware/radeon/hainan_mc.bin
+lib/firmware/radeon/hainan_me.bin
+lib/firmware/radeon/hainan_pfp.bin
+lib/firmware/radeon/hainan_rlc.bin
+lib/firmware/radeon/hainan_smc.bin
+lib/firmware/radeon/hawaii_ce.bin
+lib/firmware/radeon/hawaii_mc.bin
+lib/firmware/radeon/hawaii_me.bin
+lib/firmware/radeon/hawaii_mec.bin
+lib/firmware/radeon/hawaii_pfp.bin
+lib/firmware/radeon/hawaii_rlc.bin
+lib/firmware/radeon/hawaii_sdma.bin
+lib/firmware/radeon/hawaii_smc.bin
+lib/firmware/radeon/kabini_ce.bin
+lib/firmware/radeon/kabini_me.bin
+lib/firmware/radeon/kabini_mec.bin
+lib/firmware/radeon/kabini_pfp.bin
+lib/firmware/radeon/kabini_rlc.bin
+lib/firmware/radeon/kabini_sdma.bin
+lib/firmware/radeon/kaveri_ce.bin
+lib/firmware/radeon/kaveri_me.bin
+lib/firmware/radeon/kaveri_mec.bin
+lib/firmware/radeon/kaveri_mec2.bin
+lib/firmware/radeon/kaveri_pfp.bin
+lib/firmware/radeon/kaveri_rlc.bin
+lib/firmware/radeon/kaveri_sdma.bin
+lib/firmware/radeon/mullins_ce.bin
+lib/firmware/radeon/mullins_me.bin
+lib/firmware/radeon/mullins_mec.bin
+lib/firmware/radeon/mullins_pfp.bin
+lib/firmware/radeon/mullins_rlc.bin
+lib/firmware/radeon/mullins_sdma.bin
+lib/firmware/radeon/oland_ce.bin
+lib/firmware/radeon/oland_mc.bin
+lib/firmware/radeon/oland_me.bin
+lib/firmware/radeon/oland_pfp.bin
+lib/firmware/radeon/oland_rlc.bin
+lib/firmware/radeon/oland_smc.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/pitcairn_smc.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/tahiti_smc.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/radeon/verde_smc.bin
 lib/firmware/rp2.fw
+lib/firmware/rsi_91x.fw
 lib/firmware/rt2561.bin
 lib/firmware/rt2561s.bin
 lib/firmware/rt2661.bin
@@ -766,6 +915,8 @@ lib/firmware/rt73.bin
 lib/firmware/rtl_nic/rtl8105e-1.fw
 lib/firmware/rtl_nic/rtl8106e-1.fw
 lib/firmware/rtl_nic/rtl8106e-2.fw
+lib/firmware/rtl_nic/rtl8107e-1.fw
+lib/firmware/rtl_nic/rtl8107e-2.fw
 lib/firmware/rtl_nic/rtl8168d-1.fw
 lib/firmware/rtl_nic/rtl8168d-2.fw
 lib/firmware/rtl_nic/rtl8168e-1.fw
@@ -776,6 +927,8 @@ lib/firmware/rtl_nic/rtl8168f-2.fw
 lib/firmware/rtl_nic/rtl8168g-1.fw
 lib/firmware/rtl_nic/rtl8168g-2.fw
 lib/firmware/rtl_nic/rtl8168g-3.fw
+lib/firmware/rtl_nic/rtl8168h-1.fw
+lib/firmware/rtl_nic/rtl8168h-2.fw
 lib/firmware/rtl_nic/rtl8402-1.fw
 lib/firmware/rtl_nic/rtl8411-1.fw
 lib/firmware/rtl_nic/rtl8411-2.fw
@@ -790,15 +943,24 @@ lib/firmware/rtlwifi/rtl8192cufw_A.bin
 lib/firmware/rtlwifi/rtl8192cufw_B.bin
 lib/firmware/rtlwifi/rtl8192cufw_TMSC.bin
 lib/firmware/rtlwifi/rtl8192defw.bin
+lib/firmware/rtlwifi/rtl8192eefw.bin
 lib/firmware/rtlwifi/rtl8192sefw.bin
 lib/firmware/rtlwifi/rtl8712u.bin
+lib/firmware/rtlwifi/rtl8723aufw_A.bin
+lib/firmware/rtlwifi/rtl8723aufw_B.bin
+lib/firmware/rtlwifi/rtl8723aufw_B_NoBT.bin
+lib/firmware/rtlwifi/rtl8723befw.bin
 lib/firmware/rtlwifi/rtl8723fw.bin
 lib/firmware/rtlwifi/rtl8723fw_B.bin
+lib/firmware/rtlwifi/rtl8821aefw.bin
+lib/firmware/rtlwifi/rtl8821aefw_wowlan.bin
 lib/firmware/s2250.fw
 lib/firmware/s2250_loader.fw
-lib/firmware/s5p-mfc
-lib/firmware/s5p-mfc/s5p-mfc-v6.fw
-lib/firmware/s5p-mfc/s5p-mfc.fw
+lib/firmware/s5p-mfc-v6-v2.fw
+lib/firmware/s5p-mfc-v6.fw
+lib/firmware/s5p-mfc-v7.fw
+lib/firmware/s5p-mfc-v8.fw
+lib/firmware/s5p-mfc.fw
 #lib/firmware/sb16
 lib/firmware/sb16/alaw_main.csp
 lib/firmware/sb16/ima_adpcm_capture.csp
@@ -812,11 +974,17 @@ lib/firmware/slicoss/gbrcvucode.sys
 lib/firmware/slicoss/oasisdbgdownload.sys
 lib/firmware/slicoss/oasisdownload.sys
 lib/firmware/slicoss/oasisrcvucode.sys
+lib/firmware/sms1xxx-hcw-55xxx-dvbt-02.fw
+lib/firmware/sms1xxx-hcw-55xxx-isdbt-02.fw
+lib/firmware/sms1xxx-nova-a-dvbt-01.fw
+lib/firmware/sms1xxx-nova-b-dvbt-01.fw
+lib/firmware/sms1xxx-stellar-dvbt-01.fw
 #lib/firmware/sun
 lib/firmware/sun/cassini.bin
 #lib/firmware/sxg
 lib/firmware/sxg/saharadbgdownloadB.sys
 lib/firmware/sxg/saharadownloadB.sys
+lib/firmware/tdmb_nova_12mhz.inp
 #lib/firmware/tehuti
 lib/firmware/tehuti/bdx.bin
 #lib/firmware/ti-connectivity
@@ -850,6 +1018,8 @@ lib/firmware/ti-connectivity/wl128x-nvs.bin
 lib/firmware/ti-connectivity/wl12xx-nvs.bin
 lib/firmware/ti-connectivity/wl18xx-conf.bin
 lib/firmware/ti-connectivity/wl18xx-fw-2.bin
+lib/firmware/ti-connectivity/wl18xx-fw-3.bin
+lib/firmware/ti-connectivity/wl18xx-fw-4.bin
 lib/firmware/ti-connectivity/wl18xx-fw.bin
 lib/firmware/ti_3410.fw
 lib/firmware/ti_5052.fw
--- a/config/rootfiles/common/ntp
+++ b/config/rootfiles/common/ntp
@@ -3,6 +3,7 @@ etc/ntp.conf
 etc/rc.d/rc0.d/K46ntpd
 etc/rc.d/rc3.d/S26ntpd
 etc/rc.d/rc6.d/K46ntpd
+usr/bin/calc_tickadj
 usr/bin/ntp-keygen
 usr/bin/ntp-wait
 usr/bin/ntpd
@@ -13,12 +14,273 @@ usr/bin/ntptime
 usr/bin/ntptrace
 usr/bin/sntp
 usr/bin/tickadj
+#usr/include/event2
+#usr/share/doc/ntp4
+#usr/share/doc/ntp4/html
+#usr/share/doc/ntp4/html/access.html
+#usr/share/doc/ntp4/html/accopt.html
+#usr/share/doc/ntp4/html/assoc.html
+#usr/share/doc/ntp4/html/audio.html
+#usr/share/doc/ntp4/html/authentic.html
+#usr/share/doc/ntp4/html/authopt.html
+#usr/share/doc/ntp4/html/autokey.html
+#usr/share/doc/ntp4/html/bugs.html
+#usr/share/doc/ntp4/html/build.html
+#usr/share/doc/ntp4/html/clock.html
+#usr/share/doc/ntp4/html/clockopt.html
+#usr/share/doc/ntp4/html/cluster.html
+#usr/share/doc/ntp4/html/comdex.html
+#usr/share/doc/ntp4/html/config.html
+#usr/share/doc/ntp4/html/confopt.html
+#usr/share/doc/ntp4/html/copyright.html
+#usr/share/doc/ntp4/html/debug.html
+#usr/share/doc/ntp4/html/decode.html
+#usr/share/doc/ntp4/html/discipline.html
+#usr/share/doc/ntp4/html/discover.html
+#usr/share/doc/ntp4/html/drivers
+#usr/share/doc/ntp4/html/drivers/driver1.html
+#usr/share/doc/ntp4/html/drivers/driver10.html
+#usr/share/doc/ntp4/html/drivers/driver11.html
+#usr/share/doc/ntp4/html/drivers/driver12.html
+#usr/share/doc/ntp4/html/drivers/driver16.html
+#usr/share/doc/ntp4/html/drivers/driver18.html
+#usr/share/doc/ntp4/html/drivers/driver19.html
+#usr/share/doc/ntp4/html/drivers/driver20.html
+#usr/share/doc/ntp4/html/drivers/driver22.html
+#usr/share/doc/ntp4/html/drivers/driver26.html
+#usr/share/doc/ntp4/html/drivers/driver27.html
+#usr/share/doc/ntp4/html/drivers/driver28.html
+#usr/share/doc/ntp4/html/drivers/driver29.html
+#usr/share/doc/ntp4/html/drivers/driver3.html
+#usr/share/doc/ntp4/html/drivers/driver30.html
+#usr/share/doc/ntp4/html/drivers/driver31.html
+#usr/share/doc/ntp4/html/drivers/driver32.html
+#usr/share/doc/ntp4/html/drivers/driver33.html
+#usr/share/doc/ntp4/html/drivers/driver34.html
+#usr/share/doc/ntp4/html/drivers/driver35.html
+#usr/share/doc/ntp4/html/drivers/driver36.html
+#usr/share/doc/ntp4/html/drivers/driver37.html
+#usr/share/doc/ntp4/html/drivers/driver38.html
+#usr/share/doc/ntp4/html/drivers/driver39.html
+#usr/share/doc/ntp4/html/drivers/driver4.html
+#usr/share/doc/ntp4/html/drivers/driver40.html
+#usr/share/doc/ntp4/html/drivers/driver42.html
+#usr/share/doc/ntp4/html/drivers/driver43.html
+#usr/share/doc/ntp4/html/drivers/driver44.html
+#usr/share/doc/ntp4/html/drivers/driver45.html
+#usr/share/doc/ntp4/html/drivers/driver46.html
+#usr/share/doc/ntp4/html/drivers/driver5.html
+#usr/share/doc/ntp4/html/drivers/driver6.html
+#usr/share/doc/ntp4/html/drivers/driver7.html
+#usr/share/doc/ntp4/html/drivers/driver8.html
+#usr/share/doc/ntp4/html/drivers/driver9.html
+#usr/share/doc/ntp4/html/drivers/icons
+#usr/share/doc/ntp4/html/drivers/icons/home.gif
+#usr/share/doc/ntp4/html/drivers/icons/mail2.gif
+#usr/share/doc/ntp4/html/drivers/mx4200data.html
+#usr/share/doc/ntp4/html/drivers/oncore-shmem.html
+#usr/share/doc/ntp4/html/drivers/scripts
+#usr/share/doc/ntp4/html/drivers/scripts/footer.txt
+#usr/share/doc/ntp4/html/drivers/scripts/style.css
+#usr/share/doc/ntp4/html/drivers/tf582_4.html
+#usr/share/doc/ntp4/html/extern.html
+#usr/share/doc/ntp4/html/filter.html
+#usr/share/doc/ntp4/html/hints
+#usr/share/doc/ntp4/html/hints.html
+#usr/share/doc/ntp4/html/hints/a-ux
+#usr/share/doc/ntp4/html/hints/aix
+#usr/share/doc/ntp4/html/hints/bsdi
+#usr/share/doc/ntp4/html/hints/changes
+#usr/share/doc/ntp4/html/hints/decosf1
+#usr/share/doc/ntp4/html/hints/decosf2
+#usr/share/doc/ntp4/html/hints/freebsd
+#usr/share/doc/ntp4/html/hints/hpux
+#usr/share/doc/ntp4/html/hints/linux
+#usr/share/doc/ntp4/html/hints/mpeix
+#usr/share/doc/ntp4/html/hints/notes-xntp-v3
+#usr/share/doc/ntp4/html/hints/parse
+#usr/share/doc/ntp4/html/hints/refclocks
+#usr/share/doc/ntp4/html/hints/rs6000
+#usr/share/doc/ntp4/html/hints/sco.html
+#usr/share/doc/ntp4/html/hints/sgi
+#usr/share/doc/ntp4/html/hints/solaris-dosynctodr.html
+#usr/share/doc/ntp4/html/hints/solaris.html
+#usr/share/doc/ntp4/html/hints/solaris.xtra.4023118
+#usr/share/doc/ntp4/html/hints/solaris.xtra.4095849
+#usr/share/doc/ntp4/html/hints/solaris.xtra.S99ntpd
+#usr/share/doc/ntp4/html/hints/solaris.xtra.patchfreq
+#usr/share/doc/ntp4/html/hints/sun4
+#usr/share/doc/ntp4/html/hints/svr4-dell
+#usr/share/doc/ntp4/html/hints/svr4_package
+#usr/share/doc/ntp4/html/hints/todo
+#usr/share/doc/ntp4/html/hints/vxworks.html
+#usr/share/doc/ntp4/html/hints/winnt.html
+#usr/share/doc/ntp4/html/history.html
+#usr/share/doc/ntp4/html/howto.html
+#usr/share/doc/ntp4/html/huffpuff.html
+#usr/share/doc/ntp4/html/icons
+#usr/share/doc/ntp4/html/icons/home.gif
+#usr/share/doc/ntp4/html/icons/mail2.gif
+#usr/share/doc/ntp4/html/icons/sitemap.png
+#usr/share/doc/ntp4/html/index.html
+#usr/share/doc/ntp4/html/kern.html
+#usr/share/doc/ntp4/html/kernpps.html
+#usr/share/doc/ntp4/html/keygen.html
+#usr/share/doc/ntp4/html/leap.html
+#usr/share/doc/ntp4/html/miscopt.html
+#usr/share/doc/ntp4/html/monopt.html
+#usr/share/doc/ntp4/html/msyslog.html
+#usr/share/doc/ntp4/html/ntp-wait.html
+#usr/share/doc/ntp4/html/ntp_conf.html
+#usr/share/doc/ntp4/html/ntpd.html
+#usr/share/doc/ntp4/html/ntpdate.html
+#usr/share/doc/ntp4/html/ntpdc.html
+#usr/share/doc/ntp4/html/ntpdsim.html
+#usr/share/doc/ntp4/html/ntpdsim_new.html
+#usr/share/doc/ntp4/html/ntpq.html
+#usr/share/doc/ntp4/html/ntptime.html
+#usr/share/doc/ntp4/html/ntptrace.html
+#usr/share/doc/ntp4/html/orphan.html
+#usr/share/doc/ntp4/html/parsedata.html
+#usr/share/doc/ntp4/html/parsenew.html
+#usr/share/doc/ntp4/html/pic
+#usr/share/doc/ntp4/html/pic/9400n.jpg
+#usr/share/doc/ntp4/html/pic/alice11.gif
+#usr/share/doc/ntp4/html/pic/alice13.gif
+#usr/share/doc/ntp4/html/pic/alice15.gif
+#usr/share/doc/ntp4/html/pic/alice23.gif
+#usr/share/doc/ntp4/html/pic/alice31.gif
+#usr/share/doc/ntp4/html/pic/alice32.gif
+#usr/share/doc/ntp4/html/pic/alice35.gif
+#usr/share/doc/ntp4/html/pic/alice38.gif
+#usr/share/doc/ntp4/html/pic/alice44.gif
+#usr/share/doc/ntp4/html/pic/alice47.gif
+#usr/share/doc/ntp4/html/pic/alice51.gif
+#usr/share/doc/ntp4/html/pic/alice61.gif
+#usr/share/doc/ntp4/html/pic/barnstable.gif
+#usr/share/doc/ntp4/html/pic/beaver.gif
+#usr/share/doc/ntp4/html/pic/boom3.gif
+#usr/share/doc/ntp4/html/pic/boom3a.gif
+#usr/share/doc/ntp4/html/pic/boom4.gif
+#usr/share/doc/ntp4/html/pic/broad.gif
+#usr/share/doc/ntp4/html/pic/bustardfly.gif
+#usr/share/doc/ntp4/html/pic/c51.jpg
+#usr/share/doc/ntp4/html/pic/description.jpg
+#usr/share/doc/ntp4/html/pic/discipline.gif
+#usr/share/doc/ntp4/html/pic/dogsnake.gif
+#usr/share/doc/ntp4/html/pic/driver29.gif
+#usr/share/doc/ntp4/html/pic/driver43_1.gif
+#usr/share/doc/ntp4/html/pic/driver43_2.jpg
+#usr/share/doc/ntp4/html/pic/fg6021.gif
+#usr/share/doc/ntp4/html/pic/fg6039.jpg
+#usr/share/doc/ntp4/html/pic/fig_3_1.gif
+#usr/share/doc/ntp4/html/pic/flatheads.gif
+#usr/share/doc/ntp4/html/pic/flt1.gif
+#usr/share/doc/ntp4/html/pic/flt2.gif
+#usr/share/doc/ntp4/html/pic/flt3.gif
+#usr/share/doc/ntp4/html/pic/flt4.gif
+#usr/share/doc/ntp4/html/pic/flt5.gif
+#usr/share/doc/ntp4/html/pic/flt6.gif
+#usr/share/doc/ntp4/html/pic/flt7.gif
+#usr/share/doc/ntp4/html/pic/flt8.gif
+#usr/share/doc/ntp4/html/pic/flt9.gif
+#usr/share/doc/ntp4/html/pic/freq1211.gif
+#usr/share/doc/ntp4/html/pic/gadget.jpg
+#usr/share/doc/ntp4/html/pic/gps167.jpg
+#usr/share/doc/ntp4/html/pic/group.gif
+#usr/share/doc/ntp4/html/pic/hornraba.gif
+#usr/share/doc/ntp4/html/pic/igclock.gif
+#usr/share/doc/ntp4/html/pic/neoclock4x.gif
+#usr/share/doc/ntp4/html/pic/offset1211.gif
+#usr/share/doc/ntp4/html/pic/oncore_evalbig.gif
+#usr/share/doc/ntp4/html/pic/oncore_remoteant.jpg
+#usr/share/doc/ntp4/html/pic/oncore_utplusbig.gif
+#usr/share/doc/ntp4/html/pic/oz2.gif
+#usr/share/doc/ntp4/html/pic/panda.gif
+#usr/share/doc/ntp4/html/pic/pd_om006.gif
+#usr/share/doc/ntp4/html/pic/pd_om011.gif
+#usr/share/doc/ntp4/html/pic/peer.gif
+#usr/share/doc/ntp4/html/pic/pogo.gif
+#usr/share/doc/ntp4/html/pic/pogo1a.gif
+#usr/share/doc/ntp4/html/pic/pogo3a.gif
+#usr/share/doc/ntp4/html/pic/pogo4.gif
+#usr/share/doc/ntp4/html/pic/pogo5.gif
+#usr/share/doc/ntp4/html/pic/pogo6.gif
+#usr/share/doc/ntp4/html/pic/pogo7.gif
+#usr/share/doc/ntp4/html/pic/pogo8.gif
+#usr/share/doc/ntp4/html/pic/pzf509.jpg
+#usr/share/doc/ntp4/html/pic/pzf511.jpg
+#usr/share/doc/ntp4/html/pic/rabbit.gif
+#usr/share/doc/ntp4/html/pic/radio2.jpg
+#usr/share/doc/ntp4/html/pic/sheepb.jpg
+#usr/share/doc/ntp4/html/pic/stack1a.jpg
+#usr/share/doc/ntp4/html/pic/stats.gif
+#usr/share/doc/ntp4/html/pic/sx5.gif
+#usr/share/doc/ntp4/html/pic/thunderbolt.jpg
+#usr/share/doc/ntp4/html/pic/time1.gif
+#usr/share/doc/ntp4/html/pic/tonea.gif
+#usr/share/doc/ntp4/html/pic/tribeb.gif
+#usr/share/doc/ntp4/html/pic/wingdorothy.gif
+#usr/share/doc/ntp4/html/poll.html
+#usr/share/doc/ntp4/html/pps.html
+#usr/share/doc/ntp4/html/prefer.html
+#usr/share/doc/ntp4/html/quick.html
+#usr/share/doc/ntp4/html/rate.html
+#usr/share/doc/ntp4/html/rdebug.html
+#usr/share/doc/ntp4/html/refclock.html
+#usr/share/doc/ntp4/html/release.html
+#usr/share/doc/ntp4/html/scripts
+#usr/share/doc/ntp4/html/scripts/accopt.txt
+#usr/share/doc/ntp4/html/scripts/audio.txt
+#usr/share/doc/ntp4/html/scripts/authopt.txt
+#usr/share/doc/ntp4/html/scripts/clockopt.txt
+#usr/share/doc/ntp4/html/scripts/command.txt
+#usr/share/doc/ntp4/html/scripts/config.txt
+#usr/share/doc/ntp4/html/scripts/confopt.txt
+#usr/share/doc/ntp4/html/scripts/external.txt
+#usr/share/doc/ntp4/html/scripts/footer.txt
+#usr/share/doc/ntp4/html/scripts/hand.txt
+#usr/share/doc/ntp4/html/scripts/install.txt
+#usr/share/doc/ntp4/html/scripts/manual.txt
+#usr/share/doc/ntp4/html/scripts/misc.txt
+#usr/share/doc/ntp4/html/scripts/miscopt.txt
+#usr/share/doc/ntp4/html/scripts/monopt.txt
+#usr/share/doc/ntp4/html/scripts/refclock.txt
+#usr/share/doc/ntp4/html/scripts/special.txt
+#usr/share/doc/ntp4/html/scripts/style.css
+#usr/share/doc/ntp4/html/select.html
+#usr/share/doc/ntp4/html/sitemap.html
+#usr/share/doc/ntp4/html/sntp.html
+#usr/share/doc/ntp4/html/stats.html
+#usr/share/doc/ntp4/html/tickadj.html
+#usr/share/doc/ntp4/html/warp.html
+#usr/share/doc/ntp4/html/xleave.html
+#usr/share/doc/ntp4/ntp-keygen.html
+#usr/share/doc/ntp4/ntp-wait.html
+#usr/share/doc/ntp4/ntp.conf.html
+#usr/share/doc/ntp4/ntp.keys.html
+#usr/share/doc/ntp4/ntpd.html
+#usr/share/doc/ntp4/ntpdc.html
+#usr/share/doc/ntp4/ntpq.html
+#usr/share/doc/ntp4/ntpsnmpd.html
+#usr/share/doc/ntp4/ntpsweep.html
+#usr/share/doc/ntp4/ntptrace.html
+#usr/share/doc/sntp
+#usr/share/doc/sntp/sntp.html
+#usr/share/man/man1/calc_tickadj.1
 #usr/share/man/man1/ntp-keygen.1
+#usr/share/man/man1/ntp-wait.1
 #usr/share/man/man1/ntpd.1
 #usr/share/man/man1/ntpdc.1
 #usr/share/man/man1/ntpq.1
-#usr/share/man/man1/ntpsnmpd.1
+#usr/share/man/man1/ntptrace.1
 #usr/share/man/man1/sntp.1
+#usr/share/man/man5/ntp.conf.5
+#usr/share/man/man5/ntp.keys.5
+#usr/share/ntp
+#usr/share/ntp/lib
+#usr/share/ntp/lib/NTP
+#usr/share/ntp/lib/NTP/Util.pm
 var/ipfire/time/counter.conf
 var/ipfire/time/enable
 var/ipfire/time/settime.conf
--- a/config/rootfiles/common/setup
+++ b/config/rootfiles/common/setup
@@ -1,3 +1,63 @@
 usr/bin/probenic.sh
 usr/sbin/setup
+usr/share/locale/ar/LC_MESSAGES/setup.mo
+usr/share/locale/ca/LC_MESSAGES/setup.mo
+#usr/share/locale/cs_CZ
+#usr/share/locale/cs_CZ/LC_MESSAGES
+usr/share/locale/cs_CZ/LC_MESSAGES/setup.mo
+usr/share/locale/da/LC_MESSAGES/setup.mo
 usr/share/locale/de/LC_MESSAGES/setup.mo
+#usr/share/locale/el_GR
+#usr/share/locale/el_GR/LC_MESSAGES
+usr/share/locale/el_GR/LC_MESSAGES/setup.mo
+usr/share/locale/es/LC_MESSAGES/setup.mo
+usr/share/locale/fa/LC_MESSAGES/setup.mo
+usr/share/locale/fr/LC_MESSAGES/setup.mo
+usr/share/locale/hr/LC_MESSAGES/setup.mo
+usr/share/locale/hu/LC_MESSAGES/setup.mo
+usr/share/locale/id/LC_MESSAGES/setup.mo
+usr/share/locale/it/LC_MESSAGES/setup.mo
+usr/share/locale/ja/LC_MESSAGES/setup.mo
+#usr/share/locale/ja_JP
+#usr/share/locale/ja_JP/LC_MESSAGES
+usr/share/locale/ja_JP/LC_MESSAGES/setup.mo
+#usr/share/locale/jv
+#usr/share/locale/jv/LC_MESSAGES
+usr/share/locale/jv/LC_MESSAGES/setup.mo
+#usr/share/locale/km_KH
+#usr/share/locale/km_KH/LC_MESSAGES
+usr/share/locale/km_KH/LC_MESSAGES/setup.mo
+usr/share/locale/nl/LC_MESSAGES/setup.mo
+usr/share/locale/pl/LC_MESSAGES/setup.mo
+usr/share/locale/pt_BR/LC_MESSAGES/setup.mo
+#usr/share/locale/pt_PT
+#usr/share/locale/pt_PT/LC_MESSAGES
+usr/share/locale/pt_PT/LC_MESSAGES/setup.mo
+#usr/share/locale/ro_RO
+#usr/share/locale/ro_RO/LC_MESSAGES
+usr/share/locale/ro_RO/LC_MESSAGES/setup.mo
+usr/share/locale/ru/LC_MESSAGES/setup.mo
+#usr/share/locale/ru_RU
+#usr/share/locale/ru_RU/LC_MESSAGES
+usr/share/locale/ru_RU/LC_MESSAGES/setup.mo
+usr/share/locale/rw/LC_MESSAGES/setup.mo
+usr/share/locale/sk/LC_MESSAGES/setup.mo
+usr/share/locale/sq/LC_MESSAGES/setup.mo
+usr/share/locale/sr/LC_MESSAGES/setup.mo
+#usr/share/locale/su
+#usr/share/locale/su/LC_MESSAGES
+usr/share/locale/su/LC_MESSAGES/setup.mo
+usr/share/locale/sv/LC_MESSAGES/setup.mo
+usr/share/locale/th/LC_MESSAGES/setup.mo
+#usr/share/locale/tk
+#usr/share/locale/tk/LC_MESSAGES
+usr/share/locale/tk/LC_MESSAGES/setup.mo
+usr/share/locale/tr/LC_MESSAGES/setup.mo
+usr/share/locale/uk/LC_MESSAGES/setup.mo
+#usr/share/locale/uz@Latn
+#usr/share/locale/uz@Latn/LC_MESSAGES
+usr/share/locale/uz@Latn/LC_MESSAGES/setup.mo
+usr/share/locale/vi/LC_MESSAGES/setup.mo
+#usr/share/locale/zh
+#usr/share/locale/zh/LC_MESSAGES
+usr/share/locale/zh/LC_MESSAGES/setup.mo
--- a/config/rootfiles/common/stage2
+++ b/config/rootfiles/common/stage2
@@ -20,6 +20,7 @@ etc/ld.so.conf
 etc/logrotate.conf
 etc/mime.types
 etc/modprobe.d
+etc/modprobe.d/btmrvl_sdio.conf
 etc/modprobe.d/cfg80211.conf
 etc/modprobe.d/pcspeaker.conf
 etc/modules.conf
@@ -45,6 +46,11 @@ etc/system-release
 #home
 home/nobody
 #lib
+#lib/firmware
+#lib/firmware/brcm
+lib/firmware/brcm/brcmfmac4329-sdio.txt
+lib/firmware/brcm/brcmfmac4330-sdio.txt
+lib/firmware/brcm/brcmfmac43362-sdio.txt
 #media
 media/cdrom
 media/floppy
@@ -60,6 +66,7 @@ root/.bash_logout
 root/.bash_profile
 root/.bashrc
 root/ipfire
+run
 #sbin
 #srv
 #usr/bin
@@ -94,7 +101,7 @@ usr/local/bin/scanhd
 usr/local/bin/settime
 usr/local/bin/timecheck
 usr/local/bin/timezone-transition
-#usr/local/bin/uname
+usr/local/bin/update-bootloader
 usr/local/bin/update-lang-cache
 #usr/local/include
 #usr/local/lib
@@ -138,7 +145,6 @@ usr/share/doc/licenses/GPLv3
 #usr/share/terminfo
 #usr/share/xt_geoip
 #usr/share/zoneinfo
-run
 #var
 #var/cache
 var/empty
--- a/config/rootfiles/core/86/exclude
+++ b/config/rootfiles/core/86/exclude
@@ -14,7 +14,10 @@ etc/sysconfig/firewall.local
 etc/sysconfig/rc.local
 etc/udev/rules.d/30-persistent-network.rules
 srv/web/ipfire/html/proxy.pac
-var/ipfire/ovpn
+var/ipfire/time
+var/ipfire/ovpn/ccd.conf
+var/ipfire/ovpn/ccdroute
+var/ipfire/ovpn/ccdroute2
 var/log/cache
 var/state/dhcp/dhcpd.leases
 var/updatecache
--- a/config/rootfiles/core/86/filelists/armv5tel/swconfig
+++ b/config/rootfiles/core/86/filelists/armv5tel/swconfig
@@ -0,0 +1 @@
+../../../../common/armv5tel/swconfig
--- a/config/rootfiles/core/86/filelists/armv5tel/u-boot
+++ b/config/rootfiles/core/86/filelists/armv5tel/u-boot
@@ -0,0 +1 @@
+../../../../common/armv5tel/u-boot
--- a/config/rootfiles/core/86/filelists/bash
+++ b/config/rootfiles/core/86/filelists/bash
@@ -0,0 +1 @@
+../../../common/bash
--- a/config/rootfiles/core/86/filelists/crda
+++ b/config/rootfiles/core/86/filelists/crda
@@ -0,0 +1 @@
+../../../common/crda
--- a/config/rootfiles/core/86/filelists/files
+++ b/config/rootfiles/core/86/filelists/files
@@ -1,5 +1,12 @@
 etc/system-release
 etc/issue
+etc/modprobe.d/btmrvl_sdio.conf
+etc/rc.d/init.d/collectd
+etc/rc.d/init.d/leds
+opt/pakfire/etc/pakfire.conf
+usr/lib/firewall/rules.pl
+usr/local/bin/update-bootloader
 var/ipfire/header.pl
 var/ipfire/langs
 var/ipfire/lang.pl
+var/ipfire/ovpn/openssl/ovpn.cnf
--- a/config/rootfiles/core/86/filelists/fireinfo
+++ b/config/rootfiles/core/86/filelists/fireinfo
@@ -0,0 +1 @@
+../../../common/fireinfo
--- a/config/rootfiles/core/86/filelists/iw
+++ b/config/rootfiles/core/86/filelists/iw
@@ -0,0 +1 @@
+../../../common/iw
--- a/config/rootfiles/core/86/filelists/kbd
+++ b/config/rootfiles/core/86/filelists/kbd
@@ -0,0 +1 @@
+../../../common/kbd
--- a/config/rootfiles/core/86/filelists/ntp
+++ b/config/rootfiles/core/86/filelists/ntp
@@ -0,0 +1,287 @@
+etc/ntp
+etc/ntp.conf
+etc/rc.d/rc0.d/K46ntpd
+etc/rc.d/rc3.d/S26ntpd
+etc/rc.d/rc6.d/K46ntpd
+usr/bin/calc_tickadj
+usr/bin/ntp-keygen
+usr/bin/ntp-wait
+usr/bin/ntpd
+usr/bin/ntpdate
+usr/bin/ntpdc
+usr/bin/ntpq
+usr/bin/ntptime
+usr/bin/ntptrace
+usr/bin/sntp
+usr/bin/tickadj
+#usr/include/event2
+#usr/share/doc/ntp4
+#usr/share/doc/ntp4/html
+#usr/share/doc/ntp4/html/access.html
+#usr/share/doc/ntp4/html/accopt.html
+#usr/share/doc/ntp4/html/assoc.html
+#usr/share/doc/ntp4/html/audio.html
+#usr/share/doc/ntp4/html/authentic.html
+#usr/share/doc/ntp4/html/authopt.html
+#usr/share/doc/ntp4/html/autokey.html
+#usr/share/doc/ntp4/html/bugs.html
+#usr/share/doc/ntp4/html/build.html
+#usr/share/doc/ntp4/html/clock.html
+#usr/share/doc/ntp4/html/clockopt.html
+#usr/share/doc/ntp4/html/cluster.html
+#usr/share/doc/ntp4/html/comdex.html
+#usr/share/doc/ntp4/html/config.html
+#usr/share/doc/ntp4/html/confopt.html
+#usr/share/doc/ntp4/html/copyright.html
+#usr/share/doc/ntp4/html/debug.html
+#usr/share/doc/ntp4/html/decode.html
+#usr/share/doc/ntp4/html/discipline.html
+#usr/share/doc/ntp4/html/discover.html
+#usr/share/doc/ntp4/html/drivers
+#usr/share/doc/ntp4/html/drivers/driver1.html
+#usr/share/doc/ntp4/html/drivers/driver10.html
+#usr/share/doc/ntp4/html/drivers/driver11.html
+#usr/share/doc/ntp4/html/drivers/driver12.html
+#usr/share/doc/ntp4/html/drivers/driver16.html
+#usr/share/doc/ntp4/html/drivers/driver18.html
+#usr/share/doc/ntp4/html/drivers/driver19.html
+#usr/share/doc/ntp4/html/drivers/driver20.html
+#usr/share/doc/ntp4/html/drivers/driver22.html
+#usr/share/doc/ntp4/html/drivers/driver26.html
+#usr/share/doc/ntp4/html/drivers/driver27.html
+#usr/share/doc/ntp4/html/drivers/driver28.html
+#usr/share/doc/ntp4/html/drivers/driver29.html
+#usr/share/doc/ntp4/html/drivers/driver3.html
+#usr/share/doc/ntp4/html/drivers/driver30.html
+#usr/share/doc/ntp4/html/drivers/driver31.html
+#usr/share/doc/ntp4/html/drivers/driver32.html
+#usr/share/doc/ntp4/html/drivers/driver33.html
+#usr/share/doc/ntp4/html/drivers/driver34.html
+#usr/share/doc/ntp4/html/drivers/driver35.html
+#usr/share/doc/ntp4/html/drivers/driver36.html
+#usr/share/doc/ntp4/html/drivers/driver37.html
+#usr/share/doc/ntp4/html/drivers/driver38.html
+#usr/share/doc/ntp4/html/drivers/driver39.html
+#usr/share/doc/ntp4/html/drivers/driver4.html
+#usr/share/doc/ntp4/html/drivers/driver40.html
+#usr/share/doc/ntp4/html/drivers/driver42.html
+#usr/share/doc/ntp4/html/drivers/driver43.html
+#usr/share/doc/ntp4/html/drivers/driver44.html
+#usr/share/doc/ntp4/html/drivers/driver45.html
+#usr/share/doc/ntp4/html/drivers/driver46.html
+#usr/share/doc/ntp4/html/drivers/driver5.html
+#usr/share/doc/ntp4/html/drivers/driver6.html
+#usr/share/doc/ntp4/html/drivers/driver7.html
+#usr/share/doc/ntp4/html/drivers/driver8.html
+#usr/share/doc/ntp4/html/drivers/driver9.html
+#usr/share/doc/ntp4/html/drivers/icons
+#usr/share/doc/ntp4/html/drivers/icons/home.gif
+#usr/share/doc/ntp4/html/drivers/icons/mail2.gif
+#usr/share/doc/ntp4/html/drivers/mx4200data.html
+#usr/share/doc/ntp4/html/drivers/oncore-shmem.html
+#usr/share/doc/ntp4/html/drivers/scripts
+#usr/share/doc/ntp4/html/drivers/scripts/footer.txt
+#usr/share/doc/ntp4/html/drivers/scripts/style.css
+#usr/share/doc/ntp4/html/drivers/tf582_4.html
+#usr/share/doc/ntp4/html/extern.html
+#usr/share/doc/ntp4/html/filter.html
+#usr/share/doc/ntp4/html/hints
+#usr/share/doc/ntp4/html/hints.html
+#usr/share/doc/ntp4/html/hints/a-ux
+#usr/share/doc/ntp4/html/hints/aix
+#usr/share/doc/ntp4/html/hints/bsdi
+#usr/share/doc/ntp4/html/hints/changes
+#usr/share/doc/ntp4/html/hints/decosf1
+#usr/share/doc/ntp4/html/hints/decosf2
+#usr/share/doc/ntp4/html/hints/freebsd
+#usr/share/doc/ntp4/html/hints/hpux
+#usr/share/doc/ntp4/html/hints/linux
+#usr/share/doc/ntp4/html/hints/mpeix
+#usr/share/doc/ntp4/html/hints/notes-xntp-v3
+#usr/share/doc/ntp4/html/hints/parse
+#usr/share/doc/ntp4/html/hints/refclocks
+#usr/share/doc/ntp4/html/hints/rs6000
+#usr/share/doc/ntp4/html/hints/sco.html
+#usr/share/doc/ntp4/html/hints/sgi
+#usr/share/doc/ntp4/html/hints/solaris-dosynctodr.html
+#usr/share/doc/ntp4/html/hints/solaris.html
+#usr/share/doc/ntp4/html/hints/solaris.xtra.4023118
+#usr/share/doc/ntp4/html/hints/solaris.xtra.4095849
+#usr/share/doc/ntp4/html/hints/solaris.xtra.S99ntpd
+#usr/share/doc/ntp4/html/hints/solaris.xtra.patchfreq
+#usr/share/doc/ntp4/html/hints/sun4
+#usr/share/doc/ntp4/html/hints/svr4-dell
+#usr/share/doc/ntp4/html/hints/svr4_package
+#usr/share/doc/ntp4/html/hints/todo
+#usr/share/doc/ntp4/html/hints/vxworks.html
+#usr/share/doc/ntp4/html/hints/winnt.html
+#usr/share/doc/ntp4/html/history.html
+#usr/share/doc/ntp4/html/howto.html
+#usr/share/doc/ntp4/html/huffpuff.html
+#usr/share/doc/ntp4/html/icons
+#usr/share/doc/ntp4/html/icons/home.gif
+#usr/share/doc/ntp4/html/icons/mail2.gif
+#usr/share/doc/ntp4/html/icons/sitemap.png
+#usr/share/doc/ntp4/html/index.html
+#usr/share/doc/ntp4/html/kern.html
+#usr/share/doc/ntp4/html/kernpps.html
+#usr/share/doc/ntp4/html/keygen.html
+#usr/share/doc/ntp4/html/leap.html
+#usr/share/doc/ntp4/html/miscopt.html
+#usr/share/doc/ntp4/html/monopt.html
+#usr/share/doc/ntp4/html/msyslog.html
+#usr/share/doc/ntp4/html/ntp-wait.html
+#usr/share/doc/ntp4/html/ntp_conf.html
+#usr/share/doc/ntp4/html/ntpd.html
+#usr/share/doc/ntp4/html/ntpdate.html
+#usr/share/doc/ntp4/html/ntpdc.html
+#usr/share/doc/ntp4/html/ntpdsim.html
+#usr/share/doc/ntp4/html/ntpdsim_new.html
+#usr/share/doc/ntp4/html/ntpq.html
+#usr/share/doc/ntp4/html/ntptime.html
+#usr/share/doc/ntp4/html/ntptrace.html
+#usr/share/doc/ntp4/html/orphan.html
+#usr/share/doc/ntp4/html/parsedata.html
+#usr/share/doc/ntp4/html/parsenew.html
+#usr/share/doc/ntp4/html/pic
+#usr/share/doc/ntp4/html/pic/9400n.jpg
+#usr/share/doc/ntp4/html/pic/alice11.gif
+#usr/share/doc/ntp4/html/pic/alice13.gif
+#usr/share/doc/ntp4/html/pic/alice15.gif
+#usr/share/doc/ntp4/html/pic/alice23.gif
+#usr/share/doc/ntp4/html/pic/alice31.gif
+#usr/share/doc/ntp4/html/pic/alice32.gif
+#usr/share/doc/ntp4/html/pic/alice35.gif
+#usr/share/doc/ntp4/html/pic/alice38.gif
+#usr/share/doc/ntp4/html/pic/alice44.gif
+#usr/share/doc/ntp4/html/pic/alice47.gif
+#usr/share/doc/ntp4/html/pic/alice51.gif
+#usr/share/doc/ntp4/html/pic/alice61.gif
+#usr/share/doc/ntp4/html/pic/barnstable.gif
+#usr/share/doc/ntp4/html/pic/beaver.gif
+#usr/share/doc/ntp4/html/pic/boom3.gif
+#usr/share/doc/ntp4/html/pic/boom3a.gif
+#usr/share/doc/ntp4/html/pic/boom4.gif
+#usr/share/doc/ntp4/html/pic/broad.gif
+#usr/share/doc/ntp4/html/pic/bustardfly.gif
+#usr/share/doc/ntp4/html/pic/c51.jpg
+#usr/share/doc/ntp4/html/pic/description.jpg
+#usr/share/doc/ntp4/html/pic/discipline.gif
+#usr/share/doc/ntp4/html/pic/dogsnake.gif
+#usr/share/doc/ntp4/html/pic/driver29.gif
+#usr/share/doc/ntp4/html/pic/driver43_1.gif
+#usr/share/doc/ntp4/html/pic/driver43_2.jpg
+#usr/share/doc/ntp4/html/pic/fg6021.gif
+#usr/share/doc/ntp4/html/pic/fg6039.jpg
+#usr/share/doc/ntp4/html/pic/fig_3_1.gif
+#usr/share/doc/ntp4/html/pic/flatheads.gif
+#usr/share/doc/ntp4/html/pic/flt1.gif
+#usr/share/doc/ntp4/html/pic/flt2.gif
+#usr/share/doc/ntp4/html/pic/flt3.gif
+#usr/share/doc/ntp4/html/pic/flt4.gif
+#usr/share/doc/ntp4/html/pic/flt5.gif
+#usr/share/doc/ntp4/html/pic/flt6.gif
+#usr/share/doc/ntp4/html/pic/flt7.gif
+#usr/share/doc/ntp4/html/pic/flt8.gif
+#usr/share/doc/ntp4/html/pic/flt9.gif
+#usr/share/doc/ntp4/html/pic/freq1211.gif
+#usr/share/doc/ntp4/html/pic/gadget.jpg
+#usr/share/doc/ntp4/html/pic/gps167.jpg
+#usr/share/doc/ntp4/html/pic/group.gif
+#usr/share/doc/ntp4/html/pic/hornraba.gif
+#usr/share/doc/ntp4/html/pic/igclock.gif
+#usr/share/doc/ntp4/html/pic/neoclock4x.gif
+#usr/share/doc/ntp4/html/pic/offset1211.gif
+#usr/share/doc/ntp4/html/pic/oncore_evalbig.gif
+#usr/share/doc/ntp4/html/pic/oncore_remoteant.jpg
+#usr/share/doc/ntp4/html/pic/oncore_utplusbig.gif
+#usr/share/doc/ntp4/html/pic/oz2.gif
+#usr/share/doc/ntp4/html/pic/panda.gif
+#usr/share/doc/ntp4/html/pic/pd_om006.gif
+#usr/share/doc/ntp4/html/pic/pd_om011.gif
+#usr/share/doc/ntp4/html/pic/peer.gif
+#usr/share/doc/ntp4/html/pic/pogo.gif
+#usr/share/doc/ntp4/html/pic/pogo1a.gif
+#usr/share/doc/ntp4/html/pic/pogo3a.gif
+#usr/share/doc/ntp4/html/pic/pogo4.gif
+#usr/share/doc/ntp4/html/pic/pogo5.gif
+#usr/share/doc/ntp4/html/pic/pogo6.gif
+#usr/share/doc/ntp4/html/pic/pogo7.gif
+#usr/share/doc/ntp4/html/pic/pogo8.gif
+#usr/share/doc/ntp4/html/pic/pzf509.jpg
+#usr/share/doc/ntp4/html/pic/pzf511.jpg
+#usr/share/doc/ntp4/html/pic/rabbit.gif
+#usr/share/doc/ntp4/html/pic/radio2.jpg
+#usr/share/doc/ntp4/html/pic/sheepb.jpg
+#usr/share/doc/ntp4/html/pic/stack1a.jpg
+#usr/share/doc/ntp4/html/pic/stats.gif
+#usr/share/doc/ntp4/html/pic/sx5.gif
+#usr/share/doc/ntp4/html/pic/thunderbolt.jpg
+#usr/share/doc/ntp4/html/pic/time1.gif
+#usr/share/doc/ntp4/html/pic/tonea.gif
+#usr/share/doc/ntp4/html/pic/tribeb.gif
+#usr/share/doc/ntp4/html/pic/wingdorothy.gif
+#usr/share/doc/ntp4/html/poll.html
+#usr/share/doc/ntp4/html/pps.html
+#usr/share/doc/ntp4/html/prefer.html
+#usr/share/doc/ntp4/html/quick.html
+#usr/share/doc/ntp4/html/rate.html
+#usr/share/doc/ntp4/html/rdebug.html
+#usr/share/doc/ntp4/html/refclock.html
+#usr/share/doc/ntp4/html/release.html
+#usr/share/doc/ntp4/html/scripts
+#usr/share/doc/ntp4/html/scripts/accopt.txt
+#usr/share/doc/ntp4/html/scripts/audio.txt
+#usr/share/doc/ntp4/html/scripts/authopt.txt
+#usr/share/doc/ntp4/html/scripts/clockopt.txt
+#usr/share/doc/ntp4/html/scripts/command.txt
+#usr/share/doc/ntp4/html/scripts/config.txt
+#usr/share/doc/ntp4/html/scripts/confopt.txt
+#usr/share/doc/ntp4/html/scripts/external.txt
+#usr/share/doc/ntp4/html/scripts/footer.txt
+#usr/share/doc/ntp4/html/scripts/hand.txt
+#usr/share/doc/ntp4/html/scripts/install.txt
+#usr/share/doc/ntp4/html/scripts/manual.txt
+#usr/share/doc/ntp4/html/scripts/misc.txt
+#usr/share/doc/ntp4/html/scripts/miscopt.txt
+#usr/share/doc/ntp4/html/scripts/monopt.txt
+#usr/share/doc/ntp4/html/scripts/refclock.txt
+#usr/share/doc/ntp4/html/scripts/special.txt
+#usr/share/doc/ntp4/html/scripts/style.css
+#usr/share/doc/ntp4/html/select.html
+#usr/share/doc/ntp4/html/sitemap.html
+#usr/share/doc/ntp4/html/sntp.html
+#usr/share/doc/ntp4/html/stats.html
+#usr/share/doc/ntp4/html/tickadj.html
+#usr/share/doc/ntp4/html/warp.html
+#usr/share/doc/ntp4/html/xleave.html
+#usr/share/doc/ntp4/ntp-keygen.html
+#usr/share/doc/ntp4/ntp-wait.html
+#usr/share/doc/ntp4/ntp.conf.html
+#usr/share/doc/ntp4/ntp.keys.html
+#usr/share/doc/ntp4/ntpd.html
+#usr/share/doc/ntp4/ntpdc.html
+#usr/share/doc/ntp4/ntpq.html
+#usr/share/doc/ntp4/ntpsnmpd.html
+#usr/share/doc/ntp4/ntpsweep.html
+#usr/share/doc/ntp4/ntptrace.html
+#usr/share/doc/sntp
+#usr/share/doc/sntp/sntp.html
+#usr/share/man/man1/calc_tickadj.1
+#usr/share/man/man1/ntp-keygen.1
+#usr/share/man/man1/ntp-wait.1
+#usr/share/man/man1/ntpd.1
+#usr/share/man/man1/ntpdc.1
+#usr/share/man/man1/ntpq.1
+#usr/share/man/man1/ntptrace.1
+#usr/share/man/man1/sntp.1
+#usr/share/man/man5/ntp.conf.5
+#usr/share/man/man5/ntp.keys.5
+#usr/share/ntp
+#usr/share/ntp/lib
+#usr/share/ntp/lib/NTP
+#usr/share/ntp/lib/NTP/Util.pm
+var/ipfire/time/counter.conf
+var/ipfire/time/enable
+var/ipfire/time/settime.conf
+var/ipfire/time/settings
--- a/config/rootfiles/core/86/filelists/openssl
+++ b/config/rootfiles/core/86/filelists/openssl
@@ -0,0 +1 @@
+../../../common/openssl
--- a/config/rootfiles/core/86/filelists/openssl-compat
+++ b/config/rootfiles/core/86/filelists/openssl-compat
@@ -0,0 +1 @@
+../../../common/openssl-compat
--- a/config/rootfiles/core/86/filelists/openvpn
+++ b/config/rootfiles/core/86/filelists/openvpn
@@ -0,0 +1 @@
+../../../common/openvpn
--- a/config/rootfiles/core/86/filelists/updated-firmwares
+++ b/config/rootfiles/core/86/filelists/updated-firmwares
@@ -0,0 +1,205 @@
+lib/firmware/amd-ucode/microcode_amd_fam15h.bin
+lib/firmware/amd-ucode/microcode_amd_fam15h.bin.asc
+lib/firmware/amd-ucode/microcode_amd_fam16h.bin
+lib/firmware/amd-ucode/microcode_amd_fam16h.bin.asc
+lib/firmware/as102_data1_st.hex
+lib/firmware/as102_data2_st.hex
+lib/firmware/bnx2x/bnx2x-e1-7.10.51.0.fw
+lib/firmware/bnx2x/bnx2x-e1-7.8.19.0.fw
+lib/firmware/bnx2x/bnx2x-e1h-7.10.51.0.fw
+lib/firmware/bnx2x/bnx2x-e1h-7.8.19.0.fw
+lib/firmware/bnx2x/bnx2x-e2-7.10.51.0.fw
+lib/firmware/bnx2x/bnx2x-e2-7.8.19.0.fw
+lib/firmware/brcm/brcmfmac43143.bin
+lib/firmware/brcm/brcmfmac43143-sdio.bin
+lib/firmware/brcm/brcmfmac43362-sdio.bin
+lib/firmware/brcm/brcmfmac4354-sdio.bin
+lib/firmware/cmmb_vega_12mhz.inp
+lib/firmware/cmmb_venice_12mhz.inp
+lib/firmware/cxgb4/t4fw-1.12.25.0.bin
+lib/firmware/cxgb4/t4fw.bin
+lib/firmware/cxgb4/t5fw-1.12.25.0.bin
+lib/firmware/cxgb4/t5fw.bin
+lib/firmware/dvb-fe-drxj-mc-1.0.8.fw
+lib/firmware/dvb-fe-drxj-mc-vsb-1.0.8.fw
+lib/firmware/dvb-fe-drxj-mc-vsb-qam-1.0.8.fw
+lib/firmware/dvb-fe-xc4000-1.4.1.fw
+lib/firmware/dvb-fe-xc5000c-4.1.30.7.fw
+lib/firmware/dvb_nova_12mhz_b0.inp
+lib/firmware/dvb_nova_12mhz.inp
+lib/firmware/dvb-usb-it9135-01.fw
+lib/firmware/dvb-usb-it9135-02.fw
+lib/firmware/emi62/bitstream.fw
+lib/firmware/intel/fw_sst_0f28.bin
+lib/firmware/intel/fw_sst_0f28.bin-48kHz_i2s_master
+lib/firmware/intel/ibt-hw-37.7.10-fw-1.0.1.2d.d.bseq
+lib/firmware/intel/ibt-hw-37.7.10-fw-1.0.2.3.d.bseq
+lib/firmware/intel/ibt-hw-37.7.10-fw-1.80.1.2d.d.bseq
+lib/firmware/intel/ibt-hw-37.7.10-fw-1.80.2.3.d.bseq
+lib/firmware/intel/ibt-hw-37.8.10-fw-1.10.2.27.d.bseq
+lib/firmware/intel/ibt-hw-37.8.10-fw-1.10.3.11.e.bseq
+lib/firmware/intel/ibt-hw-37.8.bseq
+lib/firmware/intel/IntcSST2.bin
+lib/firmware/isdbt_nova_12mhz_b0.inp
+lib/firmware/isdbt_nova_12mhz.inp
+lib/firmware/isdbt_rio.inp
+lib/firmware/iwlwifi-3160-10.ucode
+lib/firmware/iwlwifi-3160-8.ucode
+lib/firmware/iwlwifi-3160-9.ucode
+lib/firmware/iwlwifi-7260-10.ucode
+lib/firmware/iwlwifi-7260-8.ucode
+lib/firmware/iwlwifi-7260-9.ucode
+lib/firmware/iwlwifi-7265-10.ucode
+lib/firmware/iwlwifi-7265-8.ucode
+lib/firmware/iwlwifi-7265-9.ucode
+lib/firmware/iwlwifi-7265D-10.ucode
+lib/firmware/LICENCE.Abilis
+lib/firmware/LICENCE.chelsio_firmware
+lib/firmware/LICENCE.fw_sst_0f28
+lib/firmware/LICENCE.ibt_firmware
+lib/firmware/LICENCE.IntcSST2
+lib/firmware/LICENCE.it913x
+lib/firmware/LICENCE.iwlwifi_firmware
+lib/firmware/LICENCE.qat_dh895xcc_firmware
+lib/firmware/LICENCE.r8a779x_usb3
+lib/firmware/LICENCE.siano
+lib/firmware/LICENCE.xc4000
+lib/firmware/LICENCE.xc5000c
+lib/firmware/LICENSE.amd-ucode
+lib/firmware/LICENSE.radeon
+lib/firmware/myri10ge_eth_big_z8e.dat
+lib/firmware/myri10ge_ethp_big_z8e.dat
+lib/firmware/myri10ge_ethp_z8e.dat
+lib/firmware/myri10ge_eth_z8e.dat
+lib/firmware/myri10ge_rss_eth_big_z8e.dat
+lib/firmware/myri10ge_rss_ethp_big_z8e.dat
+lib/firmware/myri10ge_rss_ethp_z8e.dat
+lib/firmware/myri10ge_rss_eth_z8e.dat
+lib/firmware/qat_895xcc.bin
+lib/firmware/ql2400_fw.bin
+lib/firmware/ql2500_fw.bin
+lib/firmware/r8a779x_usb3_v1.dlmem
+lib/firmware/radeon/bonaire_ce.bin
+lib/firmware/radeon/BONAIRE_mc2.bin
+lib/firmware/radeon/bonaire_mc.bin
+lib/firmware/radeon/bonaire_me.bin
+lib/firmware/radeon/bonaire_mec.bin
+lib/firmware/radeon/bonaire_pfp.bin
+lib/firmware/radeon/bonaire_rlc.bin
+lib/firmware/radeon/bonaire_sdma.bin
+lib/firmware/radeon/bonaire_smc.bin
+lib/firmware/radeon/BONAIRE_vce.bin
+lib/firmware/radeon/hainan_ce.bin
+lib/firmware/radeon/HAINAN_mc2.bin
+lib/firmware/radeon/hainan_mc.bin
+lib/firmware/radeon/hainan_me.bin
+lib/firmware/radeon/hainan_pfp.bin
+lib/firmware/radeon/hainan_rlc.bin
+lib/firmware/radeon/hainan_smc.bin
+lib/firmware/radeon/hawaii_ce.bin
+lib/firmware/radeon/HAWAII_ce.bin
+lib/firmware/radeon/HAWAII_mc2.bin
+lib/firmware/radeon/hawaii_mc.bin
+lib/firmware/radeon/HAWAII_mc.bin
+lib/firmware/radeon/hawaii_me.bin
+lib/firmware/radeon/HAWAII_me.bin
+lib/firmware/radeon/hawaii_mec.bin
+lib/firmware/radeon/HAWAII_mec.bin
+lib/firmware/radeon/hawaii_pfp.bin
+lib/firmware/radeon/HAWAII_pfp.bin
+lib/firmware/radeon/hawaii_rlc.bin
+lib/firmware/radeon/HAWAII_rlc.bin
+lib/firmware/radeon/hawaii_sdma.bin
+lib/firmware/radeon/HAWAII_sdma.bin
+lib/firmware/radeon/hawaii_smc.bin
+lib/firmware/radeon/HAWAII_smc.bin
+lib/firmware/radeon/kabini_ce.bin
+lib/firmware/radeon/kabini_me.bin
+lib/firmware/radeon/kabini_mec.bin
+lib/firmware/radeon/kabini_pfp.bin
+lib/firmware/radeon/kabini_rlc.bin
+lib/firmware/radeon/kabini_sdma.bin
+lib/firmware/radeon/kaveri_ce.bin
+lib/firmware/radeon/kaveri_me.bin
+lib/firmware/radeon/kaveri_mec2.bin
+lib/firmware/radeon/kaveri_mec.bin
+lib/firmware/radeon/kaveri_pfp.bin
+lib/firmware/radeon/kaveri_rlc.bin
+lib/firmware/radeon/kaveri_sdma.bin
+lib/firmware/radeon/mullins_ce.bin
+lib/firmware/radeon/MULLINS_ce.bin
+lib/firmware/radeon/mullins_me.bin
+lib/firmware/radeon/MULLINS_me.bin
+lib/firmware/radeon/mullins_mec.bin
+lib/firmware/radeon/MULLINS_mec.bin
+lib/firmware/radeon/mullins_pfp.bin
+lib/firmware/radeon/MULLINS_pfp.bin
+lib/firmware/radeon/mullins_rlc.bin
+lib/firmware/radeon/MULLINS_rlc.bin
+lib/firmware/radeon/mullins_sdma.bin
+lib/firmware/radeon/MULLINS_sdma.bin
+lib/firmware/radeon/oland_ce.bin
+lib/firmware/radeon/OLAND_mc2.bin
+lib/firmware/radeon/oland_mc.bin
+lib/firmware/radeon/oland_me.bin
+lib/firmware/radeon/oland_pfp.bin
+lib/firmware/radeon/oland_rlc.bin
+lib/firmware/radeon/oland_smc.bin
+lib/firmware/radeon/pitcairn_ce.bin
+lib/firmware/radeon/PITCAIRN_mc2.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/pitcairn_smc.bin
+lib/firmware/radeon/R600_uvd.bin
+lib/firmware/radeon/RS780_uvd.bin
+lib/firmware/radeon/RV770_uvd.bin
+lib/firmware/radeon/tahiti_ce.bin
+lib/firmware/radeon/TAHITI_mc2.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/tahiti_smc.bin
+lib/firmware/radeon/verde_ce.bin
+lib/firmware/radeon/VERDE_mc2.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/radeon/verde_smc.bin
+lib/firmware/README
+lib/firmware/rsi_91x.fw
+lib/firmware/rtl_nic/rtl8107e-1.fw
+lib/firmware/rtl_nic/rtl8107e-2.fw
+lib/firmware/rtl_nic/rtl8168h-1.fw
+lib/firmware/rtl_nic/rtl8168h-2.fw
+lib/firmware/rtlwifi/rtl8192cfw.bin
+lib/firmware/rtlwifi/rtl8192cfwU_B.bin
+lib/firmware/rtlwifi/rtl8192defw.bin
+lib/firmware/rtlwifi/rtl8192eefw.bin
+lib/firmware/rtlwifi/rtl8723aufw_A.bin
+lib/firmware/rtlwifi/rtl8723aufw_B.bin
+lib/firmware/rtlwifi/rtl8723aufw_B_NoBT.bin
+lib/firmware/rtlwifi/rtl8723befw.bin
+lib/firmware/rtlwifi/rtl8821aefw.bin
+lib/firmware/rtlwifi/rtl8821aefw_wowlan.bin
+lib/firmware/s5p-mfc.fw
+lib/firmware/s5p-mfc-v6.fw
+lib/firmware/s5p-mfc-v6-v2.fw
+lib/firmware/s5p-mfc-v7.fw
+lib/firmware/s5p-mfc-v8.fw
+lib/firmware/sms1xxx-hcw-55xxx-dvbt-02.fw
+lib/firmware/sms1xxx-hcw-55xxx-isdbt-02.fw
+lib/firmware/sms1xxx-nova-a-dvbt-01.fw
+lib/firmware/sms1xxx-nova-b-dvbt-01.fw
+lib/firmware/sms1xxx-stellar-dvbt-01.fw
+lib/firmware/tdmb_nova_12mhz.inp
+lib/firmware/ti-connectivity/wl18xx-fw-3.bin
+lib/firmware/ti-connectivity/wl18xx-fw-4.bin
+lib/firmware/v4l-cx23885-enc-broken.fw
+lib/firmware/WHENCE
+lib/firmware/brcm/brcmfmac4329-sdio.txt
+lib/firmware/brcm/brcmfmac4330-sdio.txt
+lib/firmware/brcm/brcmfmac43362-sdio.txt
--- a/config/rootfiles/core/86/filelists/wireless-regdb
+++ b/config/rootfiles/core/86/filelists/wireless-regdb
@@ -0,0 +1 @@
+../../../common/wireless-regdb
--- a/config/rootfiles/core/86/filelists/wpa_supplicant
+++ b/config/rootfiles/core/86/filelists/wpa_supplicant
@@ -0,0 +1 @@
+../../../common/wpa_supplicant
--- a/config/rootfiles/core/86/update.sh
+++ b/config/rootfiles/core/86/update.sh
@@ -24,15 +24,6 @@
 . /opt/pakfire/lib/functions.sh
 /usr/local/bin/backupctrl exclude >/dev/null 2>&1

-function add_to_backup ()
-{
-	# Add path to ROOTFILES but remove old entries to prevent double
-	# files in the tar
-	grep -v "^$1" /opt/pakfire/tmp/ROOTFILES > /opt/pakfire/tmp/ROOTFILES.tmp
-	mv /opt/pakfire/tmp/ROOTFILES.tmp /opt/pakfire/tmp/ROOTFILES
-	echo $1 >> /opt/pakfire/tmp/ROOTFILES
-}
-
 #
 # Remove old core updates from pakfire cache to save space...
 core=86
@@ -65,23 +56,6 @@ esac
 #
 KVER="xxxKVERxxx"

-#
-# check if we the backup file already exist
-if [ -e /var/ipfire/backup/core-upgrade${core}_${KVER}.tar.xz ]; then
-    echo Moving backup to backup-old ...
-    mv -f /var/ipfire/backup/core-upgrade${core}_${KVER}.tar.xz \
-       /var/ipfire/backup/core-upgrade${core}_${KVER}-old.tar.xz
-fi
-echo First we made a backup of all files that was inside of the
-echo update archive. This may take a while ...
-# Add some files that are not in the package to backup
-add_to_backup lib/modules
-add_to_backup boot
-
-# Backup the files
-tar cJvf /var/ipfire/backup/core-upgrade${core}_${KVER}.tar.xz \
-    -C / -T /opt/pakfire/tmp/ROOTFILES --exclude='#*' --exclude='/var/cache' > /dev/null 2>&1
-
 # Check diskspace on root
 ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1`

@@ -95,25 +69,46 @@ fi
 echo
 echo Update Kernel to $KVER ...
 #
-# Remove old kernel, configs, initrd, modules ...
+# Remove old kernel, configs, initrd, modules, dtb's ...
 #
 rm -rf /boot/System.map-*
 rm -rf /boot/config-*
 rm -rf /boot/ipfirerd-*
+rm -rf /boot/initramfs-*
 rm -rf /boot/vmlinuz-*
 rm -rf /boot/uImage-ipfire-*
 rm -rf /boot/uInit-ipfire-*
+rm -rf /boot/dtb-*-ipfire-*
 rm -rf /lib/modules

 case "$(uname -m)" in
 	i?86)
-		# Backup grub.conf
-		cp -vf /boot/grub/grub.conf /boot/grub-legacy.conf
+		# Backup old grub config
+		if [ -f /boot/grub/grub.conf ]; then
+			cp -vf /boot/grub/grub.conf /boot/old-grub-config
+		fi
+		if [ -f /boot/grub/menu.lst ]; then
+			cp -vf /boot/grub/menu.lst /boot/old-grub-config
+		fi
+		if [ -f /boot/grub/grub.cfg ]; then
+			cp -vf /boot/grub/grub.cfg /boot/old-grub-config
+		fi

 		# Remove all files that belong to GRUB-legacy
 		rm -rfv /boot/grub
 		;;
+	armv*)
+		# Backup uEnv.txt if exist
+		if [ -e /boot/uEnv.txt ]; then
+			cp -vf /boot/uEnv.txt /boot/uEnv.txt.org
+		fi
+
+		# work around the u-boot folder detection bug
+		mkdir -pv /boot/dtb-$KVER-ipfire-kirkwood
+		mkdir -pv /boot/dtb-$KVER-ipfire-multi
+		;;
 esac
+
 #
 #Stop services
 /etc/init.d/snort stop
@@ -125,6 +120,10 @@ esac
 #Extract files
 tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p --numeric-owner -C /

+#
+#restart init because glibc was updated.
+telinit u
+
 # Check diskspace on boot
 BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1`

@@ -134,6 +133,8 @@ if [ $BOOTSPACE -lt 1000 ]; then
 			# Special handling for old kirkwood images.
 			# (install only kirkwood kernel)
 			rm -rf /boot/*
+			# work around the u-boot folder detection bug
+			mkdir -pv /boot/dtb-$KVER-ipfire-kirkwood
 			tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p \
 				--numeric-owner -C / --wildcards 'boot/*-kirkwood*'
 			;;
@@ -169,22 +170,16 @@ case "$(uname -m)" in
 		#
 		echo
 		echo Update grub configuration ...
-		if grep -qE "^serial" /boot/grub-legacy.conf; then
+		if grep -qE "^serial" /boot/old-grub-config; then
 			sed -i /etc/default/grub \
-				-e "s| panic=10 | console=ttyS0,115200n8 panic=10 |g"
+				-e "s|panic=10|& console=ttyS0,115200n8|g"
 			echo "GRUB_TERMINAL=\"serial\"" >> /etc/default/grub
 			echo "GRUB_SERIAL_COMMAND=\"serial --unit=0 --speed=115200\"" >> /etc/default/grub
 		fi
-		grub-mkconfig -o /boot/grub/grub.cfg

-		ROOT=$(mount | grep " / " | cut -d" " -f1)
-		ROOT=${ROOT::-1}
-
-		if ! grub-install --no-floppy --recheck "${ROOT}"; then
-			if ! grub-install --no-floppy --recheck --force "${ROOT}"; then
-				logger -p syslog.emerg -t ipfire \
-					"Could not update the bootloader!"
-			fi
+		if ! /usr/local/bin/update-bootloader; then
+			logger -p syslog.emerg -t ipfire \
+				"Could not update the bootloader!"
 		fi
 		;;
 esac
@@ -207,18 +202,6 @@ if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then
 	fi
 fi

-# Force reinstall xen kernel if it was installed
-if [ -e "/opt/pakfire/db/installed/meta-linux-xen" ]; then
-	echo "Name: linux-xen" > /opt/pakfire/db/installed/meta-linux-xen
-	echo "ProgVersion: 0" >> /opt/pakfire/db/installed/meta-linux-xen
-	echo "Release: 0"     >> /opt/pakfire/db/installed/meta-linux-xen
-	echo "Name: linux-xen" > /opt/pakfire/db/meta/meta-linux-xen
-	echo "ProgVersion: 0" >> /opt/pakfire/db/meta/meta-linux-xen
-	echo "Release: 0"     >> /opt/pakfire/db/meta/meta-linux-xen
-	# Add xvc0 to /etc/securetty
-	echo "xvc0" >> /etc/securetty
-fi
-
 #
 # After pakfire has ended run it again and update the lists and do upgrade
 #
@@ -233,7 +216,7 @@ echo '/opt/pakfire/pakfire update -y --force'             >> /tmp/pak_update
 echo '/opt/pakfire/pakfire upgrade -y'                    >> /tmp/pak_update
 echo '/opt/pakfire/pakfire upgrade -y'                    >> /tmp/pak_update
 echo '/opt/pakfire/pakfire upgrade -y'                    >> /tmp/pak_update
-echo '/usr/bin/logger -p syslog.emerg -t ipfire "Core-upgrade finished. If you use a customized grub.cfg"' >> /tmp/pak_update
+echo '/usr/bin/logger -p syslog.emerg -t ipfire "Core-upgrade finished. If you use a customized grub/uboot config"' >> /tmp/pak_update
 echo '/usr/bin/logger -p syslog.emerg -t ipfire "Check it before reboot !!!"' >> /tmp/pak_update
 echo '/usr/bin/logger -p syslog.emerg -t ipfire " *** Please reboot... *** "' >> /tmp/pak_update
 echo 'touch /var/run/need_reboot ' >> /tmp/pak_update
--- a/config/u-boot/boot.scr
+++ b/config/u-boot/boot.scr
--- a/config/u-boot/boot.script
+++ b/config/u-boot/boot.script
@@ -1,7 +0,0 @@
-setenv initrd_high 90000000
-fatload mmc 0:1 0x82000000 zImage-ipfire-multi
-#fatload mmc 0:1 0x85000000 uInit-ipfire-multi
-fatload mmc 0:1 ${fdtaddr} omap4-${board_name}.dtb
-setenv bootargs video=800x600 console=tty1 rootwait smsc95xx.macaddr=$usbethaddr root=/dev/mmcblk0p3 ro
-#bootz 0x82000000 0x85000000 ${fdtaddr}
-bootz 0x82000000 - ${fdtaddr}
--- a/config/u-boot/convert_bootscript
+++ b/config/u-boot/convert_bootscript
@@ -1 +0,0 @@
-mkimage -A arm -T script -C none -d boot.script boot.scr
--- a/config/u-boot/uEnv.txt
+++ b/config/u-boot/uEnv.txt
@@ -0,0 +1,4 @@
+uenvcmd=if test "$board" = "panda" ;then run bootpanda; else run bootbananapi; fi;
+KVER=xxxKVERxxx
+bootpanda=setenv initrd_high 90000000; fatload mmc 0:1 0x82000000 zImage-ipfire-multi; fatload mmc 0:1 ${fdtaddr} dtb-${KVER}-ipfire-multi/${fdtfile};              setenv bootargs video=800x600 console=tty1 rootwait smsc95xx.macaddr=$usbethaddr root=/dev/mmcblk0p3 ro;           bootz 0x82000000 - ${fdtaddr};
+bootbananapi=setenv fdt_high ffffffff; fatload mmc 0:1 0x46000000 zImage-ipfire-multi; fatload mmc 0:1 0x49000000 dtb-${KVER}-ipfire-multi/sun7i-a20-bananapi.dtb;  setenv bootargs console=ttyS0,115200n8 rootwait root=/dev/mmcblk0p3 rootwait;                                      bootz 0x46000000 - 0x49000000;
--- a/html/cgi-bin/wlanap.cgi
+++ b/html/cgi-bin/wlanap.cgi
@@ -65,7 +65,7 @@ $wlanapsettings{'SSID'} = 'IPFire';
 $wlanapsettings{'HIDESSID'} = 'off';
 $wlanapsettings{'ENC'} = 'wpa2';               # none / wpa1 /wpa2
 $wlanapsettings{'TXPOWER'} = 'auto';
-$wlanapsettings{'CHANNEL'} = '05';
+$wlanapsettings{'CHANNEL'} = '6';
 $wlanapsettings{'COUNTRY'} = '00';
 $wlanapsettings{'HW_MODE'} = 'g';
 $wlanapsettings{'PWD'} = 'IPFire-2.x';
@@ -272,7 +272,7 @@ my @temp;
 foreach (@channellist_cmd){
 $_ =~ /(.*) \[(\d+)(.*)\]/;
 $channel = $2;chomp $channel;
-if ( $channel =~ /\d+/ ){push(@temp,$channel);}
+if ( $channel =~ /\d+/ ){push(@temp,$channel + 0);}
 }
@channellist = @temp;
 } else {
@@ -283,7 +283,7 @@ my @temp;
 foreach (@channellist_cmd){
 $_ =~ /(.*)Channel (\d+)(.*):/;
 $channel = $2;chomp $channel;
-if ( $channel =~ /\d+/ ){push(@temp,$channel);}
+if ( $channel =~ /\d+/ ){push(@temp,$channel + 0);}
 }
@channellist = @temp;
 }
@@ -291,7 +291,7 @@ if ( $channel =~ /\d+/ ){push(@temp,$channel);}
 my @countrylist_cmd = `regdbdump /usr/lib/crda/regulatory.bin 2>/dev/null`;
 # get available country codes

-my @temp;
+my @temp = "00";
 foreach (@countrylist_cmd){
 $_ =~ /country (.*):/;
 $country = $1;chomp $country;
--- a/lfs/backports
+++ b/lfs/backports
@@ -0,0 +1,132 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-2015  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
+
+VERSUFIX   = ipfire$(KCFG)
+
+VER        = 3.18.1-1
+
+THISAPP    = backports-$(VER)
+DL_FILE    = $(THISAPP).tar.xz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)-kmod-$(KVER)-$(VERSUFIX)
+
+#ifeq "$(MACHINE_TYPE)" "arm"
+CFLAGS   += -fno-PIC
+#endif
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 6cef5f2c800e12441d2cba9fa42b6a5b
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist: 
+	$(PAK)
+
+###############################################################################
+# 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 Jxf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/backports-3.18.1-1-ipfire-build.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/backports-3.18.1-1-grsecurity.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/backports-3.18.1-1-add_usbnet_modules.patch
+
+	# DVB patches
+	cd $(DIR_APP) && patch -Np2 < $(DIR_SRC)/src/patches/v4l-dvb_fix_tua6034_pll.patch
+
+	# Wlan patches
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/compat-drivers-3.8.3-ath_ignore_eeprom_regdomain.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.14.22-iwlwifi-noibss_only_on_radar_chan.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.10.37-rt2800usb_add_dlink_dwa137_usbid.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/backports-3.18.1-1_add_libertas_uap.patch
+
+	# smsc mac address patch for pandaboard and raspberry pi
+ifeq "$(KCFG)" "-multi"
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.10-smsc95xx-add_mac_addr_param.patch
+endif
+ifeq "$(KCFG)" "-rpi"
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.10-smsc95xx-add_mac_addr_param.patch
+endif
+
+	# generate config
+	cd $(DIR_APP) && make KLIB=/lib/modules/$(KVER)-$(VERSUFIX)/ allmodconfig
+
+	# Disable some settings
+	cd $(DIR_APP) && sed -i -e "s/CPTCFG_CFG80211_DEVELOPER_WARNINGS=y/# CPTCFG_CFG80211_DEVELOPER_WARNINGS is not set/g" .config
+	cd $(DIR_APP) && sed -i -e "s/CPTCFG_CFG80211_CERTIFICATION_ONUS=y/# CPTCFG_CFG80211_CERTIFICATION_ONUS is not set/g" .config
+	cd $(DIR_APP) && sed -i -e "s/CPTCFG_CFG80211_REG_CELLULAR_HINTS=y/# CPTCFG_CFG80211_REG_CELLULAR_HINTS is not set/g" .config
+	cd $(DIR_APP) && sed -i -e "s/CPTCFG_CFG80211_REG_RELAX_NO_IR=y/# CPTCFG_CFG80211_REG_RELAX_NO_IR is not set/g" .config
+	cd $(DIR_APP) && sed -i -e "s/CPTCFG_CFG80211_INTERNAL_REGDB=y/# CPTCFG_CFG80211_INTERNAL_REGDB is not set/g" .config
+	cd $(DIR_APP) && sed -i -e "s/CPTCFG_CFG80211_DEFAULT_PS=y/# CPTCFG_CFG80211_DEFAULT_PS is not set/g" .config
+	cd $(DIR_APP) && sed -i -e "s/CPTCFG_NFC=m/# CPTCFG_NFC is not set/g" .config
+
+	# Disable some modules (build fail)
+	cd $(DIR_APP) && sed -i -e "s/CPTCFG_VIDEO_VIA_CAMERA=m/# CPTCFG_VIDEO_VIA_CAMERA is not set/g" .config
+
+	# Disable DEBUG
+	cd $(DIR_APP) && sed -i -e "s/.*DEBUG=y/# & is not set/g" .config
+	cd $(DIR_APP) && sed -i -e "s/.*DEBUGFS=y/# & is not set/g" .config
+	cd $(DIR_APP) && sed -i -e "s/=y is not set/ is not set/g" .config
+
+	# Disable OF_GRAPH (not supported by kernel 3.14)
+	cd $(DIR_APP) && sed -i -e "s/CONFIG_OF/CONFIG_OF_IGNORE/g" include/linux/of_graph.h
+
+	cd $(DIR_APP) && make $(MAKETUNING) KLIB=/lib/modules/$(KVER)-$(VERSUFIX)/ install
+
+	# Remove vsp1 module (not mach to our platforms)
+	rm -rf /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/media/platform/vsp1
+
+	@rm -rf $(DIR_APP)
+	@$(POSTBUILD)
--- a/lfs/crda
+++ b/lfs/crda
@@ -24,10 +24,10 @@

 include Config

-VER        = 1.1.3
+VER        = 3.13

 THISAPP    = crda-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
+DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)

@@ -41,7 +41,7 @@ objects = $(DL_FILE)

 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = 29579185e06a75675507527243d28e5c
+$(DL_FILE)_MD5 = 66b1b0417c1ad19f0009a5c0c0c1aebc

 install : $(TARGET)

@@ -70,8 +70,8 @@ $(subst %,%_MD5,$(objects)) :

 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && USE_OPENSSL=1 make $(MAKETUNING)
-	cd $(DIR_APP) && USE_OPENSSL=1 make install
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && make $(MAKETUNING)
+	cd $(DIR_APP) && make install
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
--- a/lfs/dvb-firmwares
+++ b/lfs/dvb-firmwares
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2012  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2015  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        #
@@ -24,10 +24,10 @@

 include Config

-VER        = 20110802
+VER        = 20141125

 THISAPP    = dvb-firmwares-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
+DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/dvb-firmwares
 TARGET     = $(DIR_INFO)/$(THISAPP)
@@ -40,7 +40,7 @@ objects = $(DL_FILE)

 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = 330e19f9444a03f5338bab590ab9d728
+$(DL_FILE)_MD5 = 3c7182522dc091b506d2120d71a6a360

 install : $(TARGET)

--- a/lfs/fireinfo
+++ b/lfs/fireinfo
@@ -73,6 +73,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))

 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/fireinfo/0001-bogomips-Don-t-crash-when-no-bogomips-are-available.patch
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/fireinfo/0002-ARM-Read-board-model-from-device-tree-in-proc.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/fireinfo/0003-Revert-vendor-model-for-ARM-to-old-behaviour.patch

 	cd $(DIR_APP) && [ -x "configure" ] || sh ./autogen.sh
 	cd $(DIR_APP) && ./configure --prefix=/usr
--- a/lfs/flash-images
+++ b/lfs/flash-images
@@ -75,9 +75,9 @@ else
 endif

 # /boot:  64MB - OFFSET
-# /    : 700MB
+# /    : 750MB
 S_BOOT := $(shell echo $$(( 131072 - $(S_OFFSET) )))
-S_ROOT := 1433600
+S_ROOT := 1536000

 PADDING = 100 # MB

@@ -116,11 +116,14 @@ endif
 	mkdir -pv $(MNThdd)/boot
 	mount $(PART_BOOT) $(MNThdd)/boot

-	# Install MLO and uboot first
+	# Install Pandaboard MLO and uboot first
 ifeq "$(MACHINE_TYPE)" "arm"
 	cp -v /boot/MLO $(MNThdd)/boot/
 	cp -v /boot/u-boot.img $(MNThdd)/boot/
 	cp -v /boot/zImage-ipfire-multi $(MNThdd)/boot/
+	# work around a u-boot bug not find the folders sometimes
+	mkdir -pv $(MNThdd)/boot/dtb-$(KVER)-ipfire-multi
+	mkdir -pv $(MNThdd)/boot/dtb-$(KVER)-ipfire-kirkwood
 	sync
 	umount $(MNThdd)/boot
 	mount $(PART_BOOT) $(MNThdd)/boot
@@ -148,8 +151,7 @@ ifeq "$(SCON)" "1"

 ifeq "$(MACHINE_TYPE)" "arm"
 	sed -i -e "s| console=tty1 | console=ttyAMA0,115200n8 |g" $(MNThdd)/boot/cmdline.txt
-	sed -i -e "s| console=tty1 | console=ttyO2,115200n8 |g" $(MNThdd)/boot/boot.script
-	cd $(MNThdd)/boot && ./convert_bootscript
+	sed -i -e "s| console=tty1 | console=ttyO2,115200n8 |g" $(MNThdd)/boot/uEnv.txt
 endif
 endif

@@ -216,6 +218,11 @@ endif
 	# not copied to a block device)
 	dd if=/dev/zero bs=1M count=$(PADDING) >> $(IMG)

+ifeq "$(MACHINE_TYPE)" "arm"
+	# Install u-boot for LeMaker Banana Pi into image 8KB
+	dd if=/usr/share/u-boot/banana_pi/u-boot-sunxi-with-spl.bin of=$(IMG) bs=1K seek=8 conv=notrunc
+endif
+
 	# Compress Image
 	pigz -f9 < $(IMG) > $(IMAGE_FILE)
 	rm -rf $(IMG) $(MNThdd)
--- a/lfs/fping
+++ b/lfs/fping
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2015  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        #
@@ -24,7 +24,7 @@

 include Config

-VER        = 3.4
+VER        = 3.10

 THISAPP    = fping-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = fping
-PAK_VER    = 2
+PAK_VER    = 3

 DEPS       = ""

@@ -44,7 +44,7 @@ objects = $(DL_FILE)

 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = a4bc97804e630dbf26dfac8f28c78091
+$(DL_FILE)_MD5 = 6a0ddecb671df1d580d20c0dd1095773

 install : $(TARGET)

--- a/lfs/glibc
+++ b/lfs/glibc
@@ -268,12 +268,21 @@ endif
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh966775.patch
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh966778.patch
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh970090.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh995972.patch
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh1008310.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh1019916.patch
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh1022022.patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh1091162.patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh1098050.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh1027101.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh1027261.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh1032628.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh1044628.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh1111460.patch
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh1133809-1.patch
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh1133809-2.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh1139571.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh1154563.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh1170121.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh1183533.patch

 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc-resolv-stack_chk_fail.patch
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc-remove-ctors-dtors-output-sections.patch
--- a/lfs/hostapd
+++ b/lfs/hostapd
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2014  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2015  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        #
@@ -24,7 +24,7 @@

 include Config

-VER        = 2.2
+VER        = 2.3

 THISAPP    = hostapd-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = hostapd
-PAK_VER    = 30
+PAK_VER    = 33

 DEPS       = ""

@@ -44,7 +44,7 @@ objects = $(DL_FILE)

 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = 23c1f78a693c3288802d516adb7fd289
+$(DL_FILE)_MD5 = 40b89c61036add0c2dd1fc10767d3b5f

 install : $(TARGET)

--- a/lfs/initscripts
+++ b/lfs/initscripts
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2010  IPFire Team  <info@ipfire.org>                          #
+# Copyright (C) 2007-2015  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        #
@@ -194,10 +194,12 @@ $(TARGET) :
 		ln -sf any /etc/rc.d/init.d/networking/$$i; \
 	done

-	# ARM does not need checkfstab and acpid
+	# ARM does not need checkfstab and acpid, intel no swconfig
 ifeq "$(MACHINE_TYPE)" "arm"
 	rm -vf /etc/rc.d/init.d/{acpid,checkfstab}
+	ln -sf ../init.d/swconfig    /etc/rc.d/rcsysinit.d/S73swconfig
 else
+	rm -vf /etc/rc.d/init.d/swconfig
 	ln -sf ../init.d/acpid       /etc/rc.d/rc3.d/S12acpid
 	ln -sf ../init.d/acpid       /etc/rc.d/rc0.d/K87acpid
 	ln -sf ../init.d/acpid       /etc/rc.d/rc6.d/K87acpid
--- a/lfs/iw
+++ b/lfs/iw
@@ -24,7 +24,7 @@

 include Config

-VER        = 3.10
+VER        = 3.14

 THISAPP    = iw-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)

 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = 07219ad06535bc270f7a8873aba6d5fa
+$(DL_FILE)_MD5 = 66e41053f6fc0781b683b5b688442de6

 install : $(TARGET)

--- a/lfs/kbd
+++ b/lfs/kbd
@@ -35,13 +35,18 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 ###############################################################################
 # Top-level Rules
 ###############################################################################
-objects = $(DL_FILE) $(THISAPP)-more-programs-1.patch
+objects = $(DL_FILE) $(THISAPP)-more-programs-1.patch \
+	kbd-latarcyrheb-16-fixed.tar.bz2 kbd-latsun-fonts.tar.bz2

 $(DL_FILE)                            = $(DL_FROM)/$(DL_FILE)
 $(THISAPP)-more-programs-1.patch      = $(DL_FROM)/kbd-$(VER)-more-programs-1.patch
+kbd-latarcyrheb-16-fixed.tar.bz2      = $(DL_FROM)/kbd-latarcyrheb-16-fixed.tar.bz2
+kbd-latsun-fonts.tar.bz2              = $(DL_FROM)/kbd-latsun-fonts.tar.bz2

 $(DL_FILE)_MD5                        = 069d1175b4891343b107a8ac2b4a39f6
 $(THISAPP)-more-programs-1.patch_MD5  = dc70180a6bc0afa2b741cd38e3cc2e18
+kbd-latarcyrheb-16-fixed.tar.bz2_MD5  = 884fdbb0b952b2e3e8389a0c40a3e301
+kbd-latsun-fonts.tar.bz2_MD5          = e22ee88353968df8d4a4b1bf1fa8fc31

 install : $(TARGET)

@@ -74,6 +79,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-more-programs-1.patch
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-backspace-1.patch
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-gcc4_fixes-1.patch
+
+	# Extract our own fonts
+	cd $(DIR_APP) && tar xvfa $(DIR_DL)/kbd-latarcyrheb-16-fixed.tar.bz2
+	cd $(DIR_APP) && tar xvfa $(DIR_DL)/kbd-latsun-fonts.tar.bz2
+
 	cd $(DIR_APP) && ./configure --datadir=/lib/kbd --disable-nls
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
--- a/lfs/linux
+++ b/lfs/linux
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2014  IPFire Team <info@ipfire.org>                      #
+# Copyright (C) 2007-2015  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        #
@@ -24,11 +24,11 @@

 include Config

-VER        = 3.14.25
+VER        = 3.14.32

-RPI_PATCHES = 3.14.25-grsec-ipfire1
-A7M_PATCHES = 3.14.25-grsec-ipfire1
-GRS_PATCHES = grsecurity-3.0-3.14.25-201411220954.patch.xz
+RPI_PATCHES = 3.14.32-grsec-ipfire1
+A7M_PATCHES = 3.14.32-grsec-ipfire1
+GRS_PATCHES = grsecurity-3.0-3.14.32-201502062101.patch.xz

 THISAPP    = linux-$(VER)
 DL_FILE    = linux-$(VER).tar.xz
@@ -37,7 +37,7 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 CFLAGS     =
 CXXFLAGS   =

-PAK_VER    = 53
+PAK_VER    = 58
 DEPS	   = ""

 VERSUFIX=ipfire$(KCFG)
@@ -77,10 +77,10 @@ rpi-patches-$(RPI_PATCHES).patch.xz		= $(URL_IPFIRE)/rpi-patches-$(RPI_PATCHES).
 arm7-multi-patches-$(A7M_PATCHES).patch.xz	= $(URL_IPFIRE)/arm7-multi-patches-$(A7M_PATCHES).patch.xz
 $(GRS_PATCHES)					= $(URL_IPFIRE)/$(GRS_PATCHES)

-$(DL_FILE)_MD5					= 3ae910d35292706d85870c3939547123
-rpi-patches-$(RPI_PATCHES).patch.xz_MD5		= b573af847c28ebed8c15a74542360db1
-arm7-multi-patches-$(A7M_PATCHES).patch.xz_MD5	= 8b47b81a530db68cb2c2f6bb6418ca28
-$(GRS_PATCHES)_MD5				= 6b2c8669e39304cfe647f9de16260929
+$(DL_FILE)_MD5					= 3178fb8f6f1eafcffdd730fec68754f8
+rpi-patches-$(RPI_PATCHES).patch.xz_MD5		= 375dc501711ff3ffeffdfc9848675d26
+arm7-multi-patches-$(A7M_PATCHES).patch.xz_MD5	= efcfe5889f120d879387dd4ebe881587
+$(GRS_PATCHES)_MD5				= c1565eb2a630a673f3ace31a6901e251

 install : $(TARGET)

@@ -140,6 +140,8 @@ endif
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.14.22-iwlwifi-noibss_only_on_radar_chan.patch
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.10.37-rt2800usb_add_dlink_dwa137_usbid.patch
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.10.55-rt2800usb-change_queue_warn_to_debug.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.14.25_rt2x00_fix_bss_bcn_num.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.14.25-rt5592_no_special_txop_init.patch
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.10.39-add_libertas_uap.patch

 	# mISDN Patches
@@ -159,6 +161,9 @@ endif
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.2.33_ipg-fix-driver-name.patch
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.27_mcs7830-fix-driver-name.patch

+	# r8169 L23 patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.14.32-r8169_disable_L23.patch
+
 ifeq "$(KCFG)" "-kirkwood"
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.10.10-mv_cesa_disable_failing_hmac_sha1.patch
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.14.22-kirkwood_legacy_boot.patch
@@ -169,6 +174,12 @@ ifeq "$(KCFG)" "-multi"

 	# Apply Arm7-multiarch kernel patches.
 	cd $(DIR_APP) && xzcat $(DIR_DL)/arm7-multi-patches-$(A7M_PATCHES).patch.xz | patch -Np1
+
+	# Update Banana Pi, Lamobo-R1 and add Banana Pro dtb
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.14.x-update_banana_dts.patch
+
+	# Install switch api userspace header
+	cd $(DIR_APP) && install -v -m644 include/uapi/linux/switch.h /usr/include/linux/
 endif

 ifeq "$(KCFG)" "-rpi"
--- a/lfs/linux-firmware
+++ b/lfs/linux-firmware
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2014  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2015  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        #
@@ -24,7 +24,7 @@

 include Config

-VER        = 52d77db
+VER        = 78535e8

 THISAPP    = linux-firmware-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -40,7 +40,8 @@ objects = $(DL_FILE)

 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = 3f6f1e78af3ee67a5540355f2ed8ba14
+$(DL_FILE)_MD5 = a4cafb924fbcaeb34d1b464be0e4d089
+
 install : $(TARGET)

 check : $(patsubst %,$(DIR_CHK)/%,$(objects))
--- a/lfs/mtr
+++ b/lfs/mtr
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2015  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        #
@@ -24,7 +24,7 @@

 include Config

-VER        = 0.82
+VER        = 0.86

 THISAPP    = mtr-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = mtr
-PAK_VER    = 1
+PAK_VER    = 2

 DEPS       = ""

@@ -44,7 +44,7 @@ objects = $(DL_FILE)

 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = 10601ea543fda3e51545c4bce195b64c
+$(DL_FILE)_MD5 = 8d63592c9d4579ef20cf491b41843eb2

 install : $(TARGET)

--- a/lfs/ntp
+++ b/lfs/ntp
@@ -24,7 +24,7 @@

 include Config

-VER        = 4.2.6p5
+VER        = 4.2.8

 THISAPP    = ntp-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)

 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = 00df80a84ec9528fcfb09498075525bc
+$(DL_FILE)_MD5 = 6972a626be6150db8cfbd0b63d8719e7

 install : $(TARGET)

--- a/lfs/openssl
+++ b/lfs/openssl
@@ -24,7 +24,7 @@

 include Config

-VER        = 1.0.1j
+VER        = 1.0.1k

 THISAPP    = openssl-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -51,7 +51,7 @@ objects = $(DL_FILE)

 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = f7175c9cd3c39bb1907ac8bba9df8ed3
+$(DL_FILE)_MD5 = d4f002bd22a56881340105028842ae1f

 install : $(TARGET)

--- a/lfs/openssl-compat
+++ b/lfs/openssl-compat
@@ -24,7 +24,7 @@

 include Config

-VER        = 0.9.8zc
+VER        = 0.9.8zd

 THISAPP    = openssl-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)

 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = 1b239eea3a60d67863e7b66700e47a16
+$(DL_FILE)_MD5 = e9b9ee12f2911e1a378e2458d9bfff77

 install : $(TARGET)

--- a/lfs/openvpn
+++ b/lfs/openvpn
@@ -24,7 +24,7 @@

 include Config

-VER        = 2.3.4
+VER        = 2.3.6

 THISAPP    = openvpn-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)

 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = 9b70be9fb45e407117c3c9b118e4ba22
+$(DL_FILE)_MD5 = bcc30c296566df14feebdd8aa0e408ca

 install : $(TARGET)

--- a/lfs/pound
+++ b/lfs/pound
@@ -24,7 +24,7 @@

 include Config

-VER        = 2.7c
+VER        = 2.7

 THISAPP    = Pound-$(VER)
 DL_FILE    = $(THISAPP).tgz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = pound
-PAK_VER    = 6
+PAK_VER    = 7

 DEPS       = ""

@@ -44,7 +44,7 @@ objects = $(DL_FILE)

 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = 56dace6b79c6be1d25b31355269c380a
+$(DL_FILE)_MD5 = ec8298aa3e4aee3ffbecdc0639d7f14a

 install : $(TARGET)

--- a/lfs/squid-accounting
+++ b/lfs/squid-accounting
@@ -15,7 +15,7 @@ THISAPP    = squid-accounting-$(VER)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = squid-accounting
-PAK_VER    = 3
+PAK_VER    = 4

 DEPS       = "perl-DBI perl-DBD-SQLite perl-File-ReadBackwards perl-PDF-API2 sendEmail"

--- a/lfs/stage2
+++ b/lfs/stage2
@@ -49,7 +49,7 @@ $(TARGET) :
 	@$(PREBUILD)

 	# Create directories
-	-mkdir -pv /{bin,boot,etc/opt,etc/modprobe.d,home,lib,mnt,opt,run}
+	-mkdir -pv /{bin,boot,etc/opt,etc/modprobe.d,home,lib/firmware/brcm,mnt,opt,run}
 	-mkdir -pv /{media/{floppy,cdrom,usbkey},sbin,srv,var}
 	-install -dv -m 0750 /root
 	-install -dv -m 1777 /tmp /var/tmp
@@ -75,6 +75,7 @@ $(TARGET) :

 	# Config files
 	cp -rvf $(DIR_SRC)/config/etc/* /etc;
+	cp -rvf $(DIR_SRC)/config/lib/* /lib;
 	touch /etc/{fs,m}tab
 	echo "$(NAME) v$(VERSION) - $(SLOGAN)" >  /etc/issue
 	echo "===============================" >> /etc/issue
--- a/lfs/strongswan
+++ b/lfs/strongswan
@@ -78,6 +78,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/strongswan-5.1.2-5.2.1_modp_custom.patch
 	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/strongswan-5.0.2_ipfire.patch

 	cd $(DIR_APP) && [ -x "configure" ] || ./autogen.sh
--- a/lfs/swconfig
+++ b/lfs/swconfig
@@ -0,0 +1,77 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-2015  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        = 001
+
+THISAPP    = swconfig-$(VER)
+DL_FILE    = $(THISAPP).tar.xz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+SUP_ARCH   = armv5tel
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = c35919a05fc82b3f8b311da8dfc2cd3e
+
+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) && make $(MAKETUNING)
+	cd $(DIR_APP) && install -v -m755 swconfig /usr/bin/
+	@rm -rf $(DIR_APP)
+	@$(POSTBUILD)
--- a/lfs/tmux
+++ b/lfs/tmux
@@ -32,9 +32,9 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = tmux
-PAK_VER    = 1
+PAK_VER    = 2

-DEPS       = ""
+DEPS       = "libevent2"

 ###############################################################################
 # Top-level Rules
--- a/lfs/u-boot
+++ b/lfs/u-boot
@@ -24,7 +24,7 @@

 include Config

-VER        = 2013.10
+VER        = 2014.04

 THISAPP    = u-boot-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -41,7 +41,7 @@ objects = $(DL_FILE)

 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = a076a044b64371edc52f7e562b13f6b2
+$(DL_FILE)_MD5 = 6d2116d1385a66e9a59742caa9d62a54

 install : $(TARGET)

@@ -84,7 +84,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	# Install pandaboard uboot as default
 	cd $(DIR_APP) && install MLO /boot/
 	cd $(DIR_APP) && install u-boot.img /boot/
-	cp -vf $(DIR_SRC)/config/u-boot/* /boot/
 	cd $(DIR_APP) && make distclean

 	# Wandboard Quad
@@ -111,9 +110,24 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 		/usr/share/u-boot/wandboard_solo
 	cd $(DIR_APP) && make distclean

+	# LeMaker Banana Pi
+	-mkdir -pv /usr/share/u-boot/banana_pi
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/u-boot/sunxi/001-uboot-sunxi-509d96d4f1f602d62d36db660973249e16f9d088.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/u-boot/sunxi/002-uboot-jwrdegoede-psci-support.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/u-boot/sunxi/003-uboot-fix-gmac-not-working-reliable-on-bananapi.patch
+	cd $(DIR_APP) && make CROSS_COMPILE="" Bananapi_config
+	cd $(DIR_APP) && make CROSS_COMPILE="" HOSTCC="gcc $(CFLAGS)"
+	cd $(DIR_APP) && install -v -m 644 u-boot-sunxi-with-spl.bin \
+		/usr/share/u-boot/banana_pi
+
 	# mkimage
 	cd $(DIR_APP) && make CROSS_COMPILE="" HOSTCC="gcc $(CFLAGS)" tools
 	cd $(DIR_APP) && install -v -m 755 tools/mkimage /usr/bin

+	# config (uEnv.txt)
+	cp -vf $(DIR_SRC)/config/u-boot/* /boot/
+	# patch real Kernel version to uEnv.txt
+	sed -e "s/xxxKVERxxx/$(KVER)/g" -i /boot/uEnv.txt
+
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
--- a/lfs/wireless-regdb
+++ b/lfs/wireless-regdb
@@ -24,7 +24,7 @@

 include Config

-VER        = 2013.02.13
+VER        = 2014.11.18

 THISAPP    = wireless-regdb-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -41,7 +41,7 @@ objects = $(DL_FILE)

 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = 46a4aa49282ea6713c3cf28cc2fc600f
+$(DL_FILE)_MD5 = d750c402c5510add7380edcb1d9b75b2

 install : $(TARGET)

--- a/lfs/wpa_supplicant
+++ b/lfs/wpa_supplicant
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2014  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2015  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        #
@@ -24,7 +24,7 @@

 include Config

-VER        = 2.2
+VER        = 2.3

 THISAPP    = wpa_supplicant-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -41,7 +41,7 @@ objects = $(DL_FILE)

 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = 238e8e888bbd558e1a57e3eb28d1dd07
+$(DL_FILE)_MD5 = f2ed8fef72cf63d8d446a2d0a6da630a

 install : $(TARGET)

--- a/make.sh
+++ b/make.sh
@@ -25,8 +25,8 @@
 NAME="IPFire"							# Software name
 SNAME="ipfire"							# Short name
 VERSION="2.17"							# Version number
-CORE="86"							# Core Level (Filename)
-PAKFIRE_CORE="85"						# Core Level (PAKFIRE)
+CORE="87-rc1"							# Core Level (Filename)
+PAKFIRE_CORE="86"						# Core Level (PAKFIRE)
 GIT_BRANCH=`git rev-parse --abbrev-ref HEAD`			# Git Branch
 SLOGAN="www.ipfire.org"						# Software slogan
 CONFIG_ROOT=/var/ipfire						# Configuration rootdir
@@ -411,6 +411,7 @@ buildipfire() {
 	i586)
 		# x86-pae (Native and new XEN) kernel build
 		ipfiremake linux			KCFG="-pae"
+		ipfiremake backports			KCFG="-pae"
 		ipfiremake cryptodev			KCFG="-pae"
 		ipfiremake e1000e			KCFG="-pae"
 		ipfiremake igb				KCFG="-pae"
@@ -420,6 +421,7 @@ buildipfire() {

 		# x86 kernel build
 		ipfiremake linux			KCFG=""
+		ipfiremake backports			KCFG=""
 		ipfiremake cryptodev			KCFG=""
 		ipfiremake e1000e			KCFG=""
 		ipfiremake igb				KCFG=""
@@ -431,12 +433,14 @@ buildipfire() {
 	armv5tel)
 		# arm-rpi (Raspberry Pi) kernel build
 		ipfiremake linux			KCFG="-rpi"
+		ipfiremake backports			KCFG="-rpi"
 		ipfiremake cryptodev			KCFG="-rpi"
 		ipfiremake xtables-addons		KCFG="-rpi"
 		ipfiremake linux-initrd			KCFG="-rpi"

 		# arm multi platform (Panda, Wandboard ...) kernel build
 		ipfiremake linux			KCFG="-multi"
+		ipfiremake backports			KCFG="-multi"
 		ipfiremake cryptodev			KCFG="-multi"
 		ipfiremake e1000e			KCFG="-multi"
 		ipfiremake igb				KCFG="-multi"
@@ -446,6 +450,7 @@ buildipfire() {

 		# arm-kirkwood (Dreamplug, ICY-Box ...) kernel build
 		ipfiremake linux			KCFG="-kirkwood"
+		ipfiremake backports			KCFG="-kirkwood"
 		ipfiremake cryptodev			KCFG="-kirkwood"
 		ipfiremake e1000e			KCFG="-kirkwood"
 		ipfiremake igb				KCFG="-kirkwood"
@@ -811,6 +816,7 @@ buildipfire() {
  ipfiremake pigz
  ipfiremake tmux
  ipfiremake perl-Text-CSV_XS
+  ipfiremake swconfig
 }

 buildinstaller() {
--- a/src/initscripts/init.d/collectd
+++ b/src/initscripts/init.d/collectd
@@ -84,11 +84,14 @@ case "$1" in
 		fi

 		# Enable swap plugin if swap found
-		if [ "$(swapon -s | wc -l)" == "1" ]; then
+		if [ "$(swapon -s | wc -l)" == "0" ]; then
 			sed -i -e "s|^LoadPlugin swap|#LoadPlugin swap|g" /etc/collectd.conf
 		else
 			sed -i -e "s|^#LoadPlugin swap|LoadPlugin swap|g" /etc/collectd.conf
 		fi
+		
+		# sync after config update...
+		sync

 		if [ $(date +%Y) -gt 2011 ]; then
 			boot_mesg "Starting Collection daemon..."
@@ -107,6 +110,8 @@ case "$1" in
 		if [ "$(basename $0)" == "collectd" ]; then
 		    /etc/init.d/tmpfs backup
 		fi
+		# sync after backup...
+		sync
 		;;
 	restart)
 		${0} stop
--- a/src/initscripts/init.d/console
+++ b/src/initscripts/init.d/console
@@ -17,7 +17,7 @@
 . ${rc_functions}
 eval $(/usr/local/bin/readhash /var/ipfire/main/settings)

-FONT="LatArCyrHeb-16"
+FONT="latarcyrheb-sun16"
 KEYMAP_CORRECTIONS="euro2"
 UNICODE="1"
 BROKEN_COMPOSE="0"
--- a/src/initscripts/init.d/hostapd
+++ b/src/initscripts/init.d/hostapd
@@ -106,8 +106,18 @@ case "${1}" in
 		sleep 2

 		if [ "$(/usr/sbin/iwconfig $INTERFACE | /bin/grep "Mode:Master")" == "" ]; then
-			boot_mesg "Error! Can't set wlan master mode"
-			echo_failure;
+			killproc /usr/bin/hostapd > /dev/null 2>&1
+			boot_mesg "Try to create additional AP device ..." 
+			ip link set ${INTERFACE} down
+			ip link set ${INTERFACE} name ${INTERFACE}_man
+			iw dev  ${INTERFACE}_man interface add ${INTERFACE} type __ap
+			evaluate_retval;
+			if [ -d /sys/class/net/${INTERFACE} ]; then
+				/usr/bin/hostapd -P /var/run/hostapd /etc/hostapd.conf >/dev/null 2>&1 &
+			else
+				ip link set ${INTERFACE}_man down
+				ip link set ${INTERFACE}_man name ${INTERFACE}
+			fi
 			exit 0;
 		else
 			echo_ok
@@ -116,7 +126,9 @@ case "${1}" in

 	stop)
 		boot_mesg "Stopping hostapd..."
-
+		ip link set ${INTERFACE} down > /dev/null 2>&1
+		ip link set ${INTERFACE} down_man > /dev/null 2>&1
+		sleep 1
 		killproc /usr/bin/hostapd
 		evaluate_retval
 		;;
--- a/src/initscripts/init.d/leds
+++ b/src/initscripts/init.d/leds
@@ -94,6 +94,11 @@ case "${1}" in
 		setup_netdev_trigger nas6210:red:power ${RED_DEV} tx rx
 		setup_netdev_trigger nas6210:red:usb_copy ${GREEN_DEV} tx rx

+		# Mirabox start
+		setup_heartbeat_trigger mirabox:green:pwr
+		setup_netdev_trigger mirabox:green:stat ${GREEN_DEV} tx rx
+		setup_netdev_trigger mirabox:blue:stat ${BLUE_DEV} tx rx
+
 		exit 0
 	;;

@@ -132,6 +137,12 @@ case "${1}" in
 		disable_led_trigger nas6210:red:power
 		disable_led_trigger nas6210:red:usb_copy

+		# Mirabox stop
+		disable_led_trigger mirabox:green:pwr
+		enable_led mirabox:green:pwr
+		disable_led_trigger mirabox:green:stat
+		disable_led_trigger mirabox:blue:stat
+
 		exit 0
 	;;

--- a/src/initscripts/init.d/swconfig
+++ b/src/initscripts/init.d/swconfig
@@ -0,0 +1,79 @@
+#!/bin/sh
+########################################################################
+# Begin $rc_base/init.d/swconfig
+#
+# Description : Script to setup lan switch.
+#               don't edit this script! If you want change the functions
+#               create an own script called swconfig.user
+########################################################################
+
+. /etc/sysconfig/rc
+. ${rc_functions}
+
+if [ -e /etc/init.d/swconfig.user ]; then
+	/etc/init.d/swconfig.user $*
+	exit ${?}
+fi
+
+if [ -e /var/ipfire/ethernet/swconfig_mac ]; then
+SWMAC=`cat /var/ipfire/ethernet/swconfig_mac`
+else
+# Generate a random local administrated mac address for vlan swconfig.
+SWMAC=`printf "%1x2:%02x:%02x:%02x:%02x" $[RANDOM%16] $[RANDOM%256] $[RANDOM%256] $[RANDOM%256] $[RANDOM%256]`
+echo $SWMAC > /var/ipfire/ethernet/swconfig_mac
+fi
+
+case "${1}" in
+	start)
+		case `cat /proc/device-tree/model 2>/dev/null` in
+			"Lamobo-R1")
+				#
+				# Lamobo R1 aka BPi R1 Routerboard
+				#
+				# Speaker | LAN1 | LAN2 | LAN3 | LAN4 || LAN5 | HDMI
+				# SW-Port |  P2  |  P1  |  P0  |  P4  ||  P3  |
+				# VLAN    |  11  |  12  |  13  |  14  ||ALL(t)|
+				#
+				# Switch-Port P8 - ALL(t) boards internal CPU Port
+				#
+				device=`ls /sys/class/net/*/device/stmmac-0* | head -1 | cut -d/ -f5`
+				ip link set $device up
+				boot_mesg "Configure vlan-switch on $device ..."
+				# Reset switch, counter and enable vlan mode
+				swconfig dev $device set reset 1
+				swconfig dev $device set reset_mib 1
+				swconfig dev $device set enable_vlan 1
+				# configure vlans
+				swconfig dev $device vlan 11 set ports "2 3t 8t"
+				swconfig dev $device vlan 12 set ports "1 3t 8t"
+				swconfig dev $device vlan 13 set ports "0 3t 8t"
+				swconfig dev $device vlan 14 set ports "4 3t 8t"
+				# activate new config
+				swconfig dev $device set apply 1
+				# create interfaces for the vlan's
+				modprobe 8021q
+				vconfig add $device 11
+				vconfig add $device 12
+				vconfig add $device 13
+				vconfig add $device 14
+				# set local mac addresses.
+				ip link set dev $device.11 address $SWMAC:11
+				ip link set dev $device.12 address $SWMAC:12
+				ip link set dev $device.13 address $SWMAC:13
+				ip link set dev $device.14 address $SWMAC:14
+				# need to restart udev...
+				killall udevd
+				/etc/init.d/udev start
+			;;
+		esac
+		exit 0
+	;;
+
+	*)
+		echo "Usage: ${0} {start}"
+		exit 1
+	;;
+esac
+
+# End $rc_base/init.d/swconfig
+
--- a/src/installer/dracut-module/run-installer.sh
+++ b/src/installer/dracut-module/run-installer.sh
@@ -12,7 +12,7 @@ fi
 echo -en '\033%G' && kbd_mode -u

 # Load default console font
-setfont LatArCyrHeb-16
+setfont latarcyrheb-sun16

 # Silence the kernel
 echo >/proc/sys/kernel/printk "1 4 1 7"
--- a/src/installer/main.c
+++ b/src/installer/main.c
@@ -216,40 +216,55 @@ static char* get_system_release() {
 }

 static char* center_string(const char* str, int width) {
-	unsigned int str_len = strlen(str);
-
-	unsigned int indent_length = (width - str_len) / 2;
-	char indent[indent_length + 1];
-
-	for (unsigned int i = 0; i < indent_length; i++) {
-		indent[i] = ' ';
-	}
-	indent[indent_length] = '\0';
+	if (!str)
+		return NULL;

 	char* string = NULL;
-	if (asprintf(&string, "%s%s", indent, str) < 0)
-		return NULL;
+	unsigned int str_len = strlen(str);
+
+	if (str_len == width) {
+		string = strdup(str);
+
+	} else if (str_len > width) {
+		string = strdup(str);
+		string[width - 1] = '\0';
+
+	} else {
+		unsigned int indent_length = (width - str_len) / 2;
+		char indent[indent_length + 1];
+
+		for (unsigned int i = 0; i < indent_length; i++) {
+			indent[i] = ' ';
+		}
+		indent[indent_length] = '\0';
+
+		if (asprintf(&string, "%s%s", indent, str) < 0)
+			return NULL;
+	}

 	return string;
 }

-#define DEFAULT_LANG "English"
-#define NUM_LANGS 10
+#define DEFAULT_LANG "en.utf8"
+#define NUM_LANGS 13

 static struct lang {
 	const char* code;
 	char* name;
 } languages[NUM_LANGS + 1] = {
-	{ "da.utf8",    "Danish (Dansk)" },
-	{ "nl_NL.utf8", "Dutch (Nederlands)" },
-	{ "en_US.utf8", "English" },
-	{ "fr_FR.utf8", "French (Français)" },
-	{ "de_DE.utf8", "German (Deutsch)" },
-	{ "pl_PL.utf8", "Polish (Polski)" },
-	{ "pt_BR.utf8", "Portuguese (Brasil)" },
-	{ "ru_RU.utf8", "Russian (Русский)" },
-	{ "es_ES.utf8", "Spanish (Español)" },
-	{ "tr_TR.utf8", "Turkish (Türkçe)" },
+	{ "fa.utf8",    "فارسی (Persian)" },
+	{ "da.utf8",    "Dansk (Danish)" },
+	{ "es.utf8",    "Español (Spanish)" },
+	{ "en.utf8",    "English" },
+	{ "fr.utf8",    "Français (French)" },
+	{ "hr.utf8",    "Hrvatski (Croatian)" },
+	{ "it.utf8",    "Italiano (Italian)" },
+	{ "de.utf8",    "Deutsch (German)" },
+	{ "nl.utf8",    "Nederlands (Dutch)" },
+	{ "pl.utf8",    "Polski (Polish)" },
+	{ "pt.utf8",    "Portuguese (Brasil)" },
+	{ "ru.utf8",    "Русский (Russian)" },
+	{ "tr.utf8",    "Türkçe (Turkish)" },
 	{ NULL, NULL },
 };

@@ -261,6 +276,7 @@ static struct config {
 	int disable_swap;
 	char download_url[STRING_SIZE];
 	char postinstall[STRING_SIZE];
+	char* language;
 } config = {
 	.unattended = 0,
 	.serial_console = 0,
@@ -269,6 +285,7 @@ static struct config {
 	.disable_swap = 0,
 	.download_url = DOWNLOAD_URL,
 	.postinstall = "\0",
+	.language = DEFAULT_LANG,
 };

 static void parse_command_line(struct config* c) {
@@ -340,7 +357,6 @@ int main(int argc, char *argv[]) {
 	int rc = 0;
 	char commandstring[STRING_SIZE];
 	int choice;
-	char language[STRING_SIZE];
 	char message[STRING_SIZE];
 	char title[STRING_SIZE];
 	int allok = 0;
@@ -373,7 +389,8 @@ int main(int argc, char *argv[]) {

 	// Draw title
 	char* roottext = center_string(system_release, screen_cols);
-	newtDrawRootText(0, 0, roottext);
+	if (roottext)
+		newtDrawRootText(0, 0, roottext);

 	snprintf(title, sizeof(title), "%s - %s", NAME, SLOGAN);

@@ -393,7 +410,7 @@ int main(int argc, char *argv[]) {
 		char* langnames[NUM_LANGS + 1];

 		for (unsigned int i = 0; i < NUM_LANGS; i++) {
-			if (strcmp(languages[i].name, DEFAULT_LANG) == 0)
+			if (strcmp(languages[i].code, DEFAULT_LANG) == 0)
 				choice = i;

 			langnames[i] = languages[i].name;
@@ -406,10 +423,10 @@ int main(int argc, char *argv[]) {
 		assert(choice <= NUM_LANGS);

 		fprintf(flog, "Selected language: %s (%s)\n", languages[choice].name, languages[choice].code);
-		snprintf(language, sizeof(language), "%s", languages[choice].code);
+		config.language = languages[choice].code;

-		setenv("LANGUAGE", language, 1);
-		setlocale(LC_ALL, language);
+		setlocale(LC_ALL, config.language);
+		setenv("LANGUAGE", config.language, 1);
 	}

 	// Set helpline
@@ -419,7 +436,8 @@ int main(int argc, char *argv[]) {
 	else
 		helpline = center_string(_("<Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next screen"), screen_cols);

-	newtPushHelpLine(helpline);
+	if (helpline)
+		newtPushHelpLine(helpline);

 	if (!config.unattended) {
 		snprintf(message, sizeof(message),
@@ -770,7 +788,7 @@ int main(int argc, char *argv[]) {
 	}

 	/* Save language und local settings */
-	write_lang_configs(language);
+	write_lang_configs(config.language);

 	/* Build cache lang file */
 	snprintf(commandstring, STRING_SIZE, "/usr/sbin/chroot /harddisk /usr/bin/perl -e \"require '" CONFIG_ROOT "/lang.pl'; &Lang::BuildCacheLang\"");
--- a/src/installer/po/LINGUAS
+++ b/src/installer/po/LINGUAS
@@ -7,10 +7,13 @@ el_GR
 es
 fa
 fr
+hr
 hu
 id
 it
 ja
+ja_JP
+jv
 km_KH
 nl
 pl
@@ -18,8 +21,12 @@ pt_BR
 pt_PT
 ro_RO
 ru
+ru_RU
+rw
 sk
 sq
+sr
+su
 sv
 th
 tk
--- a/src/installer/po/ar.po
+++ b/src/installer/po/ar.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: IPFire Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-21 15:09+0000\n"
-"PO-Revision-Date: 2014-08-21 15:11+0000\n"
+"POT-Creation-Date: 2014-11-05 01:29+0000\n"
+"PO-Revision-Date: 2014-11-05 01:33+0000\n"
 "Last-Translator: Michael Tremer <michael.tremer@ipfire.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/ipfire/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -17,31 +17,40 @@ msgstr ""
 "Language: ar\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"

-#: main.c:77 main.c:148 main.c:313 main.c:339 main.c:493 main.c:524 main.c:682
+#: main.c:78 main.c:179 main.c:404 main.c:670 main.c:702 main.c:893
 msgid "OK"
 msgstr ""

-#: main.c:78 main.c:446 main.c:456 main.c:493 main.c:524
+#: main.c:79 main.c:460 main.c:487 main.c:516 main.c:620 main.c:630 main.c:670
+#: main.c:702
 msgid "Cancel"
 msgstr ""

-#: main.c:145
+#: main.c:176
 msgid "I accept this license"
 msgstr ""

-#: main.c:312
+#: main.c:384
+msgid "Warning: Unattended installation will start in 10 seconds..."
+msgstr ""
+
+#: main.c:403
 msgid "Language selection"
 msgstr ""

-#: main.c:312
+#: main.c:403
 msgid "Select the language you wish to use for the installation."
 msgstr ""

-#: main.c:323
+#: main.c:418
+msgid "Unattended mode"
+msgstr ""
+
+#: main.c:420
 msgid "<Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next screen"
 msgstr ""

-#: main.c:328
+#: main.c:426
 #, c-format
 msgid ""
 "Welcome to the %s installation program.\n"
@@ -49,53 +58,104 @@ msgid ""
 "Selecting Cancel on any of the following screens will reboot the computer."
 msgstr ""

-#: main.c:330
+#: main.c:428
 msgid "Start installation"
 msgstr ""

-#: main.c:339
-msgid "No local source media found. Starting download."
+#: main.c:449
+#, c-format
+msgid "The installer will now try downloading the installation image."
 msgstr ""

-#: main.c:340
-msgid "Downloading installation image ..."
+#: main.c:452
+#, c-format
+msgid ""
+"No source drive could be found.\n"
+"\n"
+"You can try downloading the required installation image."
 msgstr ""

-#: main.c:342
-msgid "Download error"
+#: main.c:456
+msgid ""
+"Please make sure to connect your machine to a network and the installer will"
+" try connect to acquire an IP address."
 msgstr ""

-#: main.c:376
+#: main.c:460
+msgid "Download installation image"
+msgstr ""
+
+#: main.c:473
+msgid "Trying to start networking (DHCP)..."
+msgstr ""
+
+#: main.c:484
+msgid ""
+"Networking could not be started but is required to go on with the installation.\n"
+"\n"
+"Please connect your machine to a network with a DHCP server and retry."
+msgstr ""
+
+#: main.c:487 main.c:516
+msgid "Retry"
+msgstr ""
+
+#: main.c:501
+msgid "Downloading installation image..."
+msgstr ""
+
+#: main.c:510
+#, c-format
+msgid "MD5 checksum mismatch"
+msgstr ""
+
+#: main.c:513
+#, c-format
+msgid ""
+"The installation image could not be downloaded.\n"
+"  Reason: %s\n"
+"\n"
+"%s"
+msgstr ""
+
+#: main.c:528
+#, c-format
+msgid ""
+"Could not mount %s to %s:\n"
+"  %s\n"
+msgstr ""
+
+#: main.c:543
 msgid "License Agreement"
 msgstr ""

-#: main.c:377
+#: main.c:544
 msgid "License not accepted!"
 msgstr ""

-#: main.c:399
+#: main.c:566
 msgid "No hard disk found."
 msgstr ""

-#: main.c:418
+#: main.c:587
 msgid "Disk Selection"
 msgstr ""

-#: main.c:419
+#: main.c:588
 msgid ""
 "Select the disk(s) you want to install IPFire on. First those will be partitioned, and then the partitions will have a filesystem put on them.\n"
 "\n"
 "ALL DATA ON THE DISK WILL BE DESTROYED."
 msgstr ""

-#: main.c:430
+#: main.c:599
 msgid ""
 "No disk has been selected.\n"
 "\n"
 "Please select one or more disks you want to install IPFire on."
 msgstr ""

-#: main.c:443
+#: main.c:617
 #, c-format
 msgid ""
 "The installation program will now prepare the chosen harddisk:\n"
@@ -105,15 +165,15 @@ msgid ""
 "Do you agree to continue?"
 msgstr ""

-#: main.c:445
+#: main.c:619
 msgid "Disk Setup"
 msgstr ""

-#: main.c:446 main.c:456
+#: main.c:620 main.c:630
 msgid "Delete all data"
 msgstr ""

-#: main.c:453
+#: main.c:627
 #, c-format
 msgid ""
 "The installation program will now set up a RAID configuration on the selected harddisks:\n"
@@ -124,104 +184,131 @@ msgid ""
 "Do you agree to continue?"
 msgstr ""

-#: main.c:455
+#: main.c:629
 msgid "RAID Setup"
 msgstr ""

-#: main.c:466
-msgid "You disk configuration is currently not supported."
+#: main.c:640
+msgid "Your disk configuration is currently not supported."
 msgstr ""

-#: main.c:480
+#: main.c:655
 msgid "Your harddisk is too small."
 msgstr ""

-#: main.c:494
+#: main.c:671
 msgid ""
 "Your harddisk is very small, but you can continue without a swap partition."
 msgstr ""

-#: main.c:506
+#: main.c:684
 msgid "ext4 Filesystem"
 msgstr ""

-#: main.c:507
+#: main.c:685
 msgid "ext4 Filesystem without journal"
 msgstr ""

-#: main.c:508
+#: main.c:686
 msgid "XFS Filesystem"
 msgstr ""

-#: main.c:509
+#: main.c:687
 msgid "ReiserFS Filesystem"
 msgstr ""

-#: main.c:523
+#: main.c:701
 msgid "Filesystem Selection"
 msgstr ""

-#: main.c:523
+#: main.c:701
 msgid "Please choose your filesystem:"
 msgstr ""

-#: main.c:534
+#: main.c:712
 msgid "Building RAID..."
 msgstr ""

-#: main.c:538
+#: main.c:716
 msgid "Unable to build the RAID."
 msgstr ""

-#: main.c:550
+#: main.c:728
 msgid "Partitioning disk..."
 msgstr ""

-#: main.c:554
+#: main.c:732
 msgid "Unable to partition the disk."
 msgstr ""

-#: main.c:561
+#: main.c:739
 msgid "Creating filesystems..."
 msgstr ""

-#: main.c:565
+#: main.c:743
 msgid "Unable to create filesystems."
 msgstr ""

-#: main.c:571
+#: main.c:749
 msgid "Unable to mount filesystems."
 msgstr ""

-#: main.c:582
+#: main.c:760
 msgid "Installing the system..."
 msgstr ""

-#: main.c:583
+#: main.c:761
 msgid "Unable to install the system."
 msgstr ""

-#: main.c:599
+#: main.c:777
 msgid "Installing the language cache..."
 msgstr ""

-#: main.c:600
+#: main.c:778
 msgid "Unable to install the language cache."
 msgstr ""

-#: main.c:605
+#: main.c:783
 msgid "Installing the bootloader..."
 msgstr ""

-#: main.c:612
+#: main.c:790
 msgid "Unable to open /etc/default/grub for writing."
 msgstr ""

-#: main.c:634
+#: main.c:812
 msgid "Unable to install the bootloader."
 msgstr ""

-#: main.c:666
+#: main.c:826
+msgid ""
+"A backup file has been found on the installation image.\n"
+"\n"
+"Do you want to restore the backup?"
+msgstr ""
+
+#: main.c:827
+msgid "Yes"
+msgstr ""
+
+#: main.c:827
+msgid "No"
+msgstr ""
+
+#: main.c:834
+msgid "An error occured when the backup file was restored."
+msgstr ""
+
+#: main.c:869
+msgid "Running post-install script..."
+msgstr ""
+
+#: main.c:870
+msgid "Post-install script failed."
+msgstr ""
+
+#: main.c:877
 #, c-format
 msgid ""
 "%s was successfully installed!\n"
@@ -229,14 +316,14 @@ msgid ""
 "Please remove any installation mediums from this system and hit the reboot button. Once the system has restarted you will be asked to setup networking and system passwords. After that, you should point your web browser at https://%s:444 (or what ever you name your %s) for the web configuration console."
 msgstr ""

-#: main.c:671
+#: main.c:882
 msgid "Congratulations!"
 msgstr ""

-#: main.c:671
+#: main.c:882
 msgid "Reboot"
 msgstr ""

-#: main.c:682
+#: main.c:893
 msgid "Setup has failed. Press Ok to reboot."
 msgstr ""
--- a/src/installer/po/ca.po
+++ b/src/installer/po/ca.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: IPFire Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-21 15:09+0000\n"
-"PO-Revision-Date: 2014-08-21 15:11+0000\n"
+"POT-Creation-Date: 2014-11-05 01:29+0000\n"
+"PO-Revision-Date: 2014-11-05 01:33+0000\n"
 "Last-Translator: Michael Tremer <michael.tremer@ipfire.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/ipfire/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -17,31 +17,40 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"

-#: main.c:77 main.c:148 main.c:313 main.c:339 main.c:493 main.c:524 main.c:682
+#: main.c:78 main.c:179 main.c:404 main.c:670 main.c:702 main.c:893
 msgid "OK"
 msgstr ""

-#: main.c:78 main.c:446 main.c:456 main.c:493 main.c:524
+#: main.c:79 main.c:460 main.c:487 main.c:516 main.c:620 main.c:630 main.c:670
+#: main.c:702
 msgid "Cancel"
 msgstr ""

-#: main.c:145
+#: main.c:176
 msgid "I accept this license"
 msgstr ""

-#: main.c:312
+#: main.c:384
+msgid "Warning: Unattended installation will start in 10 seconds..."
+msgstr ""
+
+#: main.c:403
 msgid "Language selection"
 msgstr ""

-#: main.c:312
+#: main.c:403
 msgid "Select the language you wish to use for the installation."
 msgstr ""

-#: main.c:323
+#: main.c:418
+msgid "Unattended mode"
+msgstr ""
+
+#: main.c:420
 msgid "<Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next screen"
 msgstr ""

-#: main.c:328
+#: main.c:426
 #, c-format
 msgid ""
 "Welcome to the %s installation program.\n"
@@ -49,53 +58,104 @@ msgid ""
 "Selecting Cancel on any of the following screens will reboot the computer."
 msgstr ""

-#: main.c:330
+#: main.c:428
 msgid "Start installation"
 msgstr ""

-#: main.c:339
-msgid "No local source media found. Starting download."
+#: main.c:449
+#, c-format
+msgid "The installer will now try downloading the installation image."
 msgstr ""

-#: main.c:340
-msgid "Downloading installation image ..."
+#: main.c:452
+#, c-format
+msgid ""
+"No source drive could be found.\n"
+"\n"
+"You can try downloading the required installation image."
 msgstr ""

-#: main.c:342
-msgid "Download error"
+#: main.c:456
+msgid ""
+"Please make sure to connect your machine to a network and the installer will"
+" try connect to acquire an IP address."
 msgstr ""

-#: main.c:376
+#: main.c:460
+msgid "Download installation image"
+msgstr ""
+
+#: main.c:473
+msgid "Trying to start networking (DHCP)..."
+msgstr ""
+
+#: main.c:484
+msgid ""
+"Networking could not be started but is required to go on with the installation.\n"
+"\n"
+"Please connect your machine to a network with a DHCP server and retry."
+msgstr ""
+
+#: main.c:487 main.c:516
+msgid "Retry"
+msgstr ""
+
+#: main.c:501
+msgid "Downloading installation image..."
+msgstr ""
+
+#: main.c:510
+#, c-format
+msgid "MD5 checksum mismatch"
+msgstr ""
+
+#: main.c:513
+#, c-format
+msgid ""
+"The installation image could not be downloaded.\n"
+"  Reason: %s\n"
+"\n"
+"%s"
+msgstr ""
+
+#: main.c:528
+#, c-format
+msgid ""
+"Could not mount %s to %s:\n"
+"  %s\n"
+msgstr ""
+
+#: main.c:543
 msgid "License Agreement"
 msgstr ""

-#: main.c:377
+#: main.c:544
 msgid "License not accepted!"
 msgstr ""

-#: main.c:399
+#: main.c:566
 msgid "No hard disk found."
 msgstr ""

-#: main.c:418
+#: main.c:587
 msgid "Disk Selection"
 msgstr ""

-#: main.c:419
+#: main.c:588
 msgid ""
 "Select the disk(s) you want to install IPFire on. First those will be partitioned, and then the partitions will have a filesystem put on them.\n"
 "\n"
 "ALL DATA ON THE DISK WILL BE DESTROYED."
 msgstr ""

-#: main.c:430
+#: main.c:599
 msgid ""
 "No disk has been selected.\n"
 "\n"
 "Please select one or more disks you want to install IPFire on."
 msgstr ""

-#: main.c:443
+#: main.c:617
 #, c-format
 msgid ""
 "The installation program will now prepare the chosen harddisk:\n"
@@ -105,15 +165,15 @@ msgid ""
 "Do you agree to continue?"
 msgstr ""

-#: main.c:445
+#: main.c:619
 msgid "Disk Setup"
 msgstr ""

-#: main.c:446 main.c:456
+#: main.c:620 main.c:630
 msgid "Delete all data"
 msgstr ""

-#: main.c:453
+#: main.c:627
 #, c-format
 msgid ""
 "The installation program will now set up a RAID configuration on the selected harddisks:\n"
@@ -124,104 +184,131 @@ msgid ""
 "Do you agree to continue?"
 msgstr ""

-#: main.c:455
+#: main.c:629
 msgid "RAID Setup"
 msgstr ""

-#: main.c:466
-msgid "You disk configuration is currently not supported."
+#: main.c:640
+msgid "Your disk configuration is currently not supported."
 msgstr ""

-#: main.c:480
+#: main.c:655
 msgid "Your harddisk is too small."
 msgstr ""

-#: main.c:494
+#: main.c:671
 msgid ""
 "Your harddisk is very small, but you can continue without a swap partition."
 msgstr ""

-#: main.c:506
+#: main.c:684
 msgid "ext4 Filesystem"
 msgstr ""

-#: main.c:507
+#: main.c:685
 msgid "ext4 Filesystem without journal"
 msgstr ""

-#: main.c:508
+#: main.c:686
 msgid "XFS Filesystem"
 msgstr ""

-#: main.c:509
+#: main.c:687
 msgid "ReiserFS Filesystem"
 msgstr ""

-#: main.c:523
+#: main.c:701
 msgid "Filesystem Selection"
 msgstr ""

-#: main.c:523
+#: main.c:701
 msgid "Please choose your filesystem:"
 msgstr ""

-#: main.c:534
+#: main.c:712
 msgid "Building RAID..."
 msgstr ""

-#: main.c:538
+#: main.c:716
 msgid "Unable to build the RAID."
 msgstr ""

-#: main.c:550
+#: main.c:728
 msgid "Partitioning disk..."
 msgstr ""

-#: main.c:554
+#: main.c:732
 msgid "Unable to partition the disk."
 msgstr ""

-#: main.c:561
+#: main.c:739
 msgid "Creating filesystems..."
 msgstr ""

-#: main.c:565
+#: main.c:743
 msgid "Unable to create filesystems."
 msgstr ""

-#: main.c:571
+#: main.c:749
 msgid "Unable to mount filesystems."
 msgstr ""

-#: main.c:582
+#: main.c:760
 msgid "Installing the system..."
 msgstr ""

-#: main.c:583
+#: main.c:761
 msgid "Unable to install the system."
 msgstr ""

-#: main.c:599
+#: main.c:777
 msgid "Installing the language cache..."
 msgstr ""

-#: main.c:600
+#: main.c:778
 msgid "Unable to install the language cache."
 msgstr ""

-#: main.c:605
+#: main.c:783
 msgid "Installing the bootloader..."
 msgstr ""

-#: main.c:612
+#: main.c:790
 msgid "Unable to open /etc/default/grub for writing."
 msgstr ""

-#: main.c:634
+#: main.c:812
 msgid "Unable to install the bootloader."
 msgstr ""

-#: main.c:666
+#: main.c:826
+msgid ""
+"A backup file has been found on the installation image.\n"
+"\n"
+"Do you want to restore the backup?"
+msgstr ""
+
+#: main.c:827
+msgid "Yes"
+msgstr ""
+
+#: main.c:827
+msgid "No"
+msgstr ""
+
+#: main.c:834
+msgid "An error occured when the backup file was restored."
+msgstr ""
+
+#: main.c:869
+msgid "Running post-install script..."
+msgstr ""
+
+#: main.c:870
+msgid "Post-install script failed."
+msgstr ""
+
+#: main.c:877
 #, c-format
 msgid ""
 "%s was successfully installed!\n"
@@ -229,14 +316,14 @@ msgid ""
 "Please remove any installation mediums from this system and hit the reboot button. Once the system has restarted you will be asked to setup networking and system passwords. After that, you should point your web browser at https://%s:444 (or what ever you name your %s) for the web configuration console."
 msgstr ""

-#: main.c:671
+#: main.c:882
 msgid "Congratulations!"
 msgstr ""

-#: main.c:671
+#: main.c:882
 msgid "Reboot"
 msgstr ""

-#: main.c:682
+#: main.c:893
 msgid "Setup has failed. Press Ok to reboot."
 msgstr ""
--- a/src/installer/po/cs_CZ.po
+++ b/src/installer/po/cs_CZ.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: IPFire Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-21 15:09+0000\n"
-"PO-Revision-Date: 2014-08-21 15:11+0000\n"
+"POT-Creation-Date: 2014-11-05 01:29+0000\n"
+"PO-Revision-Date: 2014-11-05 01:33+0000\n"
 "Last-Translator: Michael Tremer <michael.tremer@ipfire.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/ipfire/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
@@ -17,31 +17,40 @@ msgstr ""
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"

-#: main.c:77 main.c:148 main.c:313 main.c:339 main.c:493 main.c:524 main.c:682
+#: main.c:78 main.c:179 main.c:404 main.c:670 main.c:702 main.c:893
 msgid "OK"
 msgstr ""

-#: main.c:78 main.c:446 main.c:456 main.c:493 main.c:524
+#: main.c:79 main.c:460 main.c:487 main.c:516 main.c:620 main.c:630 main.c:670
+#: main.c:702
 msgid "Cancel"
 msgstr ""

-#: main.c:145
+#: main.c:176
 msgid "I accept this license"
 msgstr ""

-#: main.c:312
+#: main.c:384
+msgid "Warning: Unattended installation will start in 10 seconds..."
+msgstr ""
+
+#: main.c:403
 msgid "Language selection"
 msgstr ""

-#: main.c:312
+#: main.c:403
 msgid "Select the language you wish to use for the installation."
 msgstr ""

-#: main.c:323
+#: main.c:418
+msgid "Unattended mode"
+msgstr ""
+
+#: main.c:420
 msgid "<Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next screen"
 msgstr ""

-#: main.c:328
+#: main.c:426
 #, c-format
 msgid ""
 "Welcome to the %s installation program.\n"
@@ -49,53 +58,104 @@ msgid ""
 "Selecting Cancel on any of the following screens will reboot the computer."
 msgstr ""

-#: main.c:330
+#: main.c:428
 msgid "Start installation"
 msgstr ""

-#: main.c:339
-msgid "No local source media found. Starting download."
+#: main.c:449
+#, c-format
+msgid "The installer will now try downloading the installation image."
 msgstr ""

-#: main.c:340
-msgid "Downloading installation image ..."
+#: main.c:452
+#, c-format
+msgid ""
+"No source drive could be found.\n"
+"\n"
+"You can try downloading the required installation image."
 msgstr ""

-#: main.c:342
-msgid "Download error"
+#: main.c:456
+msgid ""
+"Please make sure to connect your machine to a network and the installer will"
+" try connect to acquire an IP address."
 msgstr ""

-#: main.c:376
+#: main.c:460
+msgid "Download installation image"
+msgstr ""
+
+#: main.c:473
+msgid "Trying to start networking (DHCP)..."
+msgstr ""
+
+#: main.c:484
+msgid ""
+"Networking could not be started but is required to go on with the installation.\n"
+"\n"
+"Please connect your machine to a network with a DHCP server and retry."
+msgstr ""
+
+#: main.c:487 main.c:516
+msgid "Retry"
+msgstr ""
+
+#: main.c:501
+msgid "Downloading installation image..."
+msgstr ""
+
+#: main.c:510
+#, c-format
+msgid "MD5 checksum mismatch"
+msgstr ""
+
+#: main.c:513
+#, c-format
+msgid ""
+"The installation image could not be downloaded.\n"
+"  Reason: %s\n"
+"\n"
+"%s"
+msgstr ""
+
+#: main.c:528
+#, c-format
+msgid ""
+"Could not mount %s to %s:\n"
+"  %s\n"
+msgstr ""
+
+#: main.c:543
 msgid "License Agreement"
 msgstr ""

-#: main.c:377
+#: main.c:544
 msgid "License not accepted!"
 msgstr ""

-#: main.c:399
+#: main.c:566
 msgid "No hard disk found."
 msgstr ""

-#: main.c:418
+#: main.c:587
 msgid "Disk Selection"
 msgstr ""

-#: main.c:419
+#: main.c:588
 msgid ""
 "Select the disk(s) you want to install IPFire on. First those will be partitioned, and then the partitions will have a filesystem put on them.\n"
 "\n"
 "ALL DATA ON THE DISK WILL BE DESTROYED."
 msgstr ""

-#: main.c:430
+#: main.c:599
 msgid ""
 "No disk has been selected.\n"
 "\n"
 "Please select one or more disks you want to install IPFire on."
 msgstr ""

-#: main.c:443
+#: main.c:617
 #, c-format
 msgid ""
 "The installation program will now prepare the chosen harddisk:\n"
@@ -105,15 +165,15 @@ msgid ""
 "Do you agree to continue?"
 msgstr ""

-#: main.c:445
+#: main.c:619
 msgid "Disk Setup"
 msgstr ""

-#: main.c:446 main.c:456
+#: main.c:620 main.c:630
 msgid "Delete all data"
 msgstr ""

-#: main.c:453
+#: main.c:627
 #, c-format
 msgid ""
 "The installation program will now set up a RAID configuration on the selected harddisks:\n"
@@ -124,104 +184,131 @@ msgid ""
 "Do you agree to continue?"
 msgstr ""

-#: main.c:455
+#: main.c:629
 msgid "RAID Setup"
 msgstr ""

-#: main.c:466
-msgid "You disk configuration is currently not supported."
+#: main.c:640
+msgid "Your disk configuration is currently not supported."
 msgstr ""

-#: main.c:480
+#: main.c:655
 msgid "Your harddisk is too small."
 msgstr ""

-#: main.c:494
+#: main.c:671
 msgid ""
 "Your harddisk is very small, but you can continue without a swap partition."
 msgstr ""

-#: main.c:506
+#: main.c:684
 msgid "ext4 Filesystem"
 msgstr ""

-#: main.c:507
+#: main.c:685
 msgid "ext4 Filesystem without journal"
 msgstr ""

-#: main.c:508
+#: main.c:686
 msgid "XFS Filesystem"
 msgstr ""

-#: main.c:509
+#: main.c:687
 msgid "ReiserFS Filesystem"
 msgstr ""

-#: main.c:523
+#: main.c:701
 msgid "Filesystem Selection"
 msgstr ""

-#: main.c:523
+#: main.c:701
 msgid "Please choose your filesystem:"
 msgstr ""

-#: main.c:534
+#: main.c:712
 msgid "Building RAID..."
 msgstr ""

-#: main.c:538
+#: main.c:716
 msgid "Unable to build the RAID."
 msgstr ""

-#: main.c:550
+#: main.c:728
 msgid "Partitioning disk..."
 msgstr ""

-#: main.c:554
+#: main.c:732
 msgid "Unable to partition the disk."
 msgstr ""

-#: main.c:561
+#: main.c:739
 msgid "Creating filesystems..."
 msgstr ""

-#: main.c:565
+#: main.c:743
 msgid "Unable to create filesystems."
 msgstr ""

-#: main.c:571
+#: main.c:749
 msgid "Unable to mount filesystems."
 msgstr ""

-#: main.c:582
+#: main.c:760
 msgid "Installing the system..."
 msgstr ""

-#: main.c:583
+#: main.c:761
 msgid "Unable to install the system."
 msgstr ""

-#: main.c:599
+#: main.c:777
 msgid "Installing the language cache..."
 msgstr ""

-#: main.c:600
+#: main.c:778
 msgid "Unable to install the language cache."
 msgstr ""

-#: main.c:605
+#: main.c:783
 msgid "Installing the bootloader..."
 msgstr ""

-#: main.c:612
+#: main.c:790
 msgid "Unable to open /etc/default/grub for writing."
 msgstr ""

-#: main.c:634
+#: main.c:812
 msgid "Unable to install the bootloader."
 msgstr ""

-#: main.c:666
+#: main.c:826
+msgid ""
+"A backup file has been found on the installation image.\n"
+"\n"
+"Do you want to restore the backup?"
+msgstr ""
+
+#: main.c:827
+msgid "Yes"
+msgstr ""
+
+#: main.c:827
+msgid "No"
+msgstr ""
+
+#: main.c:834
+msgid "An error occured when the backup file was restored."
+msgstr ""
+
+#: main.c:869
+msgid "Running post-install script..."
+msgstr ""
+
+#: main.c:870
+msgid "Post-install script failed."
+msgstr ""
+
+#: main.c:877
 #, c-format
 msgid ""
 "%s was successfully installed!\n"
@@ -229,14 +316,14 @@ msgid ""
 "Please remove any installation mediums from this system and hit the reboot button. Once the system has restarted you will be asked to setup networking and system passwords. After that, you should point your web browser at https://%s:444 (or what ever you name your %s) for the web configuration console."
 msgstr ""

-#: main.c:671
+#: main.c:882
 msgid "Congratulations!"
 msgstr ""

-#: main.c:671
+#: main.c:882
 msgid "Reboot"
 msgstr ""

-#: main.c:682
+#: main.c:893
 msgid "Setup has failed. Press Ok to reboot."
 msgstr ""
--- a/src/installer/po/da.po
+++ b/src/installer/po/da.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: IPFire Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-21 15:09+0000\n"
-"PO-Revision-Date: 2014-08-21 15:11+0000\n"
+"POT-Creation-Date: 2014-11-05 01:29+0000\n"
+"PO-Revision-Date: 2014-11-05 01:33+0000\n"
 "Last-Translator: Michael Tremer <michael.tremer@ipfire.org>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/ipfire/language/da/)\n"
 "MIME-Version: 1.0\n"
@@ -18,85 +18,145 @@ msgstr ""
 "Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"

-#: main.c:77 main.c:148 main.c:313 main.c:339 main.c:493 main.c:524 main.c:682
+#: main.c:78 main.c:179 main.c:404 main.c:670 main.c:702 main.c:893
 msgid "OK"
 msgstr "OK"

-#: main.c:78 main.c:446 main.c:456 main.c:493 main.c:524
+#: main.c:79 main.c:460 main.c:487 main.c:516 main.c:620 main.c:630 main.c:670
+#: main.c:702
 msgid "Cancel"
 msgstr "Annuller"

-#: main.c:145
+#: main.c:176
 msgid "I accept this license"
 msgstr "Jeg accepterer brugerlicensen"

-#: main.c:312
+#: main.c:384
+msgid "Warning: Unattended installation will start in 10 seconds..."
+msgstr ""
+
+#: main.c:403
 msgid "Language selection"
-msgstr ""
+msgstr "Vælg sprog"

-#: main.c:312
+#: main.c:403
 msgid "Select the language you wish to use for the installation."
+msgstr "Vælg det sprog du ønsker at anvende under installationen."
+
+#: main.c:418
+msgid "Unattended mode"
 msgstr ""

-#: main.c:323
+#: main.c:420
 msgid "<Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next screen"
 msgstr "<Tab>/<Alt-Tab> mellem elementer | <Space> vælger | <F12> næste skærm"

-#: main.c:328
+#: main.c:426
 #, c-format
 msgid ""
 "Welcome to the %s installation program.\n"
 "\n"
 "Selecting Cancel on any of the following screens will reboot the computer."
-msgstr ""
+msgstr "Velkommen til %s installationsprogram.\n\nVælg Annuller på ethvert tidspunkt for at genstarte computeren."

-#: main.c:330
+#: main.c:428
 msgid "Start installation"
 msgstr "Start installationen"

-#: main.c:339
-msgid "No local source media found. Starting download."
-msgstr "Fandt ikke en lokal kilde. Henter fra internettet."
-
-#: main.c:340
-msgid "Downloading installation image ..."
-msgstr "Henter installationsbillede ..."
-
-#: main.c:342
-msgid "Download error"
-msgstr "Fejl under hentning"
-
-#: main.c:376
-msgid "License Agreement"
+#: main.c:449
+#, c-format
+msgid "The installer will now try downloading the installation image."
 msgstr ""

-#: main.c:377
+#: main.c:452
+#, c-format
+msgid ""
+"No source drive could be found.\n"
+"\n"
+"You can try downloading the required installation image."
+msgstr ""
+
+#: main.c:456
+msgid ""
+"Please make sure to connect your machine to a network and the installer will"
+" try connect to acquire an IP address."
+msgstr ""
+
+#: main.c:460
+msgid "Download installation image"
+msgstr ""
+
+#: main.c:473
+msgid "Trying to start networking (DHCP)..."
+msgstr ""
+
+#: main.c:484
+msgid ""
+"Networking could not be started but is required to go on with the installation.\n"
+"\n"
+"Please connect your machine to a network with a DHCP server and retry."
+msgstr ""
+
+#: main.c:487 main.c:516
+msgid "Retry"
+msgstr ""
+
+#: main.c:501
+msgid "Downloading installation image..."
+msgstr ""
+
+#: main.c:510
+#, c-format
+msgid "MD5 checksum mismatch"
+msgstr ""
+
+#: main.c:513
+#, c-format
+msgid ""
+"The installation image could not be downloaded.\n"
+"  Reason: %s\n"
+"\n"
+"%s"
+msgstr ""
+
+#: main.c:528
+#, c-format
+msgid ""
+"Could not mount %s to %s:\n"
+"  %s\n"
+msgstr ""
+
+#: main.c:543
+msgid "License Agreement"
+msgstr "Licensaftale"
+
+#: main.c:544
 msgid "License not accepted!"
 msgstr "Brugerlicensen ikke accepteret!"

-#: main.c:399
+#: main.c:566
 msgid "No hard disk found."
 msgstr "Fandt ikke en harddisk."

-#: main.c:418
+#: main.c:587
 msgid "Disk Selection"
 msgstr "Vælg harddisk"

-#: main.c:419
+#: main.c:588
 msgid ""
 "Select the disk(s) you want to install IPFire on. First those will be partitioned, and then the partitions will have a filesystem put on them.\n"
 "\n"
 "ALL DATA ON THE DISK WILL BE DESTROYED."
 msgstr "Vælg den eller de harddisk(e) du vil installere IPFire på. Diskene bliver først partitioneret og dernæst bliver der oprettet filsystemer.\n\nAL DATA PÅ DISKENE BLIVER SLETTET."

-#: main.c:430
+#: main.c:599
 msgid ""
 "No disk has been selected.\n"
 "\n"
 "Please select one or more disks you want to install IPFire on."
 msgstr "Ingen harddisk valgt.\n\nVælg venligst en eller flere harddiske du vil installere IPFire på."

-#: main.c:443
+#: main.c:617
 #, c-format
 msgid ""
 "The installation program will now prepare the chosen harddisk:\n"
@@ -106,15 +166,15 @@ msgid ""
 "Do you agree to continue?"
 msgstr "Installationsprogrammet forbereder nu den eller de valgte harddiske:\n\n%s\n\nVil du fortsætte?"

-#: main.c:445
+#: main.c:619
 msgid "Disk Setup"
 msgstr "Harddisk opsætning"

-#: main.c:446 main.c:456
+#: main.c:620 main.c:630
 msgid "Delete all data"
 msgstr "Slet alle data"

-#: main.c:453
+#: main.c:627
 #, c-format
 msgid ""
 "The installation program will now set up a RAID configuration on the selected harddisks:\n"
@@ -125,119 +185,146 @@ msgid ""
 "Do you agree to continue?"
 msgstr "Installationsprogrammet vil nu opsætte RAID konfigurationen på de valgte harddiske:\n\n%s\n%s\n\nVil du fortsætte?"

-#: main.c:455
+#: main.c:629
 msgid "RAID Setup"
 msgstr "RAID opsætning"

-#: main.c:466
-msgid "You disk configuration is currently not supported."
-msgstr "Din harddisk konfiguration understøttes ikke pt."
+#: main.c:640
+msgid "Your disk configuration is currently not supported."
+msgstr ""

-#: main.c:480
+#: main.c:655
 msgid "Your harddisk is too small."
 msgstr "Din harddisk er for lille."

-#: main.c:494
+#: main.c:671
 msgid ""
 "Your harddisk is very small, but you can continue without a swap partition."
-msgstr ""
+msgstr "Din harddisk er meget lille, men du kan fortsætte uden en swap partition."

-#: main.c:506
+#: main.c:684
 msgid "ext4 Filesystem"
 msgstr "ext4 filsystem"

-#: main.c:507
+#: main.c:685
 msgid "ext4 Filesystem without journal"
 msgstr "ext4 filsystem uden journal"

-#: main.c:508
+#: main.c:686
 msgid "XFS Filesystem"
 msgstr "XFS filsystem"

-#: main.c:509
+#: main.c:687
 msgid "ReiserFS Filesystem"
 msgstr "ReiserFS filsystem"

-#: main.c:523
+#: main.c:701
 msgid "Filesystem Selection"
 msgstr "Vælg filsystem"

-#: main.c:523
+#: main.c:701
 msgid "Please choose your filesystem:"
 msgstr "Vælg venligst et filsystem:"

-#: main.c:534
+#: main.c:712
 msgid "Building RAID..."
 msgstr "Bygger RAID..."

-#: main.c:538
+#: main.c:716
 msgid "Unable to build the RAID."
 msgstr "Kunne ikke bygge RAID."

-#: main.c:550
+#: main.c:728
 msgid "Partitioning disk..."
 msgstr "Partitionerer harddisk..."

-#: main.c:554
+#: main.c:732
 msgid "Unable to partition the disk."
 msgstr "Kunne ikke partitionere harddisk."

-#: main.c:561
+#: main.c:739
 msgid "Creating filesystems..."
 msgstr "Opretter filsystemer..."

-#: main.c:565
+#: main.c:743
 msgid "Unable to create filesystems."
 msgstr "Kunne ikke oprette filsystemer."

-#: main.c:571
+#: main.c:749
 msgid "Unable to mount filesystems."
 msgstr "Kunne ikke forbinde til filsystemer."

-#: main.c:582
+#: main.c:760
 msgid "Installing the system..."
 msgstr "Installerer systemet..."

-#: main.c:583
+#: main.c:761
 msgid "Unable to install the system."
 msgstr "Kunne ikke installere systemet."

-#: main.c:599
+#: main.c:777
 msgid "Installing the language cache..."
 msgstr "Installerer sprog arkivet..."

-#: main.c:600
+#: main.c:778
 msgid "Unable to install the language cache."
 msgstr "Kunne ikke installere sprog arkivet."

-#: main.c:605
+#: main.c:783
 msgid "Installing the bootloader..."
 msgstr "Installerer bootloader..."

-#: main.c:612
+#: main.c:790
 msgid "Unable to open /etc/default/grub for writing."
-msgstr ""
+msgstr "Kunne ikke gemme til /etc/default/grub."

-#: main.c:634
+#: main.c:812
 msgid "Unable to install the bootloader."
 msgstr "Kunne ikke installere bootloader."

-#: main.c:666
+#: main.c:826
+msgid ""
+"A backup file has been found on the installation image.\n"
+"\n"
+"Do you want to restore the backup?"
+msgstr ""
+
+#: main.c:827
+msgid "Yes"
+msgstr ""
+
+#: main.c:827
+msgid "No"
+msgstr ""
+
+#: main.c:834
+msgid "An error occured when the backup file was restored."
+msgstr ""
+
+#: main.c:869
+msgid "Running post-install script..."
+msgstr ""
+
+#: main.c:870
+msgid "Post-install script failed."
+msgstr ""
+
+#: main.c:877
 #, c-format
 msgid ""
 "%s was successfully installed!\n"
 "\n"
 "Please remove any installation mediums from this system and hit the reboot button. Once the system has restarted you will be asked to setup networking and system passwords. After that, you should point your web browser at https://%s:444 (or what ever you name your %s) for the web configuration console."
-msgstr ""
+msgstr "%s blev installeret korrekt!\n\nFjern venligst installationsmedier fra systemet og vælg Genstart. Efter genstart bliver du bedt om at opsætte netværket og system kodeord. Efter opsætningen, besøg da https://%s:444 (eller hvad du navngav %s) fra din internet browser for at anvende web konsollen."

-#: main.c:671
+#: main.c:882
 msgid "Congratulations!"
 msgstr "Tillykke!"

-#: main.c:671
+#: main.c:882
 msgid "Reboot"
 msgstr "Genstart"

-#: main.c:682
+#: main.c:893
 msgid "Setup has failed. Press Ok to reboot."
-msgstr ""
+msgstr "Installationen fejlede. Vælg Ok for at genstarte."
--- a/src/installer/po/de.po
+++ b/src/installer/po/de.po
@@ -4,14 +4,15 @@
 # 
 # Translators:
 # Michael Tremer <michael.tremer@ipfire.org>, 2014
+# Peter Cloudstone <rmg-mainz@web.de>, 2014
 # Stefan Schantl <stefan.schantl@ipfire.org>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: IPFire Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-21 15:09+0000\n"
-"PO-Revision-Date: 2014-08-21 16:04+0000\n"
-"Last-Translator: Stefan Schantl <stefan.schantl@ipfire.org>\n"
+"POT-Creation-Date: 2014-11-05 01:29+0000\n"
+"PO-Revision-Date: 2014-11-07 15:02+0000\n"
+"Last-Translator: Peter Cloudstone <rmg-mainz@web.de>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/ipfire/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,31 +20,40 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"

-#: main.c:77 main.c:148 main.c:313 main.c:339 main.c:493 main.c:524 main.c:682
+#: main.c:78 main.c:179 main.c:404 main.c:670 main.c:702 main.c:893
 msgid "OK"
 msgstr "OK"

-#: main.c:78 main.c:446 main.c:456 main.c:493 main.c:524
+#: main.c:79 main.c:460 main.c:487 main.c:516 main.c:620 main.c:630 main.c:670
+#: main.c:702
 msgid "Cancel"
 msgstr "Abbrechen"

-#: main.c:145
+#: main.c:176
 msgid "I accept this license"
 msgstr "Ich akzeptiere die Lizenz"

-#: main.c:312
+#: main.c:384
+msgid "Warning: Unattended installation will start in 10 seconds..."
+msgstr "Warnung: Automatische Installation startet in 10 Sekunden..."
+
+#: main.c:403
 msgid "Language selection"
 msgstr "Sprachauswahl"

-#: main.c:312
+#: main.c:403
 msgid "Select the language you wish to use for the installation."
 msgstr "Wählen Sie die gewünschte Sprache für den Installationsprozess aus."

-#: main.c:323
+#: main.c:418
+msgid "Unattended mode"
+msgstr "Automatikmodus"
+
+#: main.c:420
 msgid "<Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next screen"
 msgstr "<Tab>/<Alt-Tab> um zu wechseln | <Leertaste> wählt aus | <F12> nächster Bildschirm"

-#: main.c:328
+#: main.c:426
 #, c-format
 msgid ""
 "Welcome to the %s installation program.\n"
@@ -51,53 +61,104 @@ msgid ""
 "Selecting Cancel on any of the following screens will reboot the computer."
 msgstr "Willkommen zum %s Installationsprogramm.\n\nWenn Sie auf irgendeiner der folgenden Seiten 'Abbrechen' auswählen, wird der Computer neu gestartet."

-#: main.c:330
+#: main.c:428
 msgid "Start installation"
 msgstr "Installation beginnen"

-#: main.c:339
-msgid "No local source media found. Starting download."
-msgstr "Kein lokales Quellmedium gefunden. Starte Download."
+#: main.c:449
+#, c-format
+msgid "The installer will now try downloading the installation image."
+msgstr "Der Installer versucht nun, das Installationsimage herunterzuladen."

-#: main.c:340
-msgid "Downloading installation image ..."
+#: main.c:452
+#, c-format
+msgid ""
+"No source drive could be found.\n"
+"\n"
+"You can try downloading the required installation image."
+msgstr "Kein Quelllaufwerk gefunden.\n\nBitte versuchen Sie, das erforderliche Installationsabbild herunterzuladen."
+
+#: main.c:456
+msgid ""
+"Please make sure to connect your machine to a network and the installer will"
+" try connect to acquire an IP address."
+msgstr "Bitte stellen Sie sicher, dass der Computer mit einem Netzwerk verbunden ist, danach wird das Installationsprogramm versuchen, eine IP-Adresse zu erhalten."
+
+#: main.c:460
+msgid "Download installation image"
+msgstr "Installationsabbild wird heruntergeladen"
+
+#: main.c:473
+msgid "Trying to start networking (DHCP)..."
+msgstr "Versuche, Netzwerk (DHCP) zu starten..."
+
+#: main.c:484
+msgid ""
+"Networking could not be started but is required to go on with the installation.\n"
+"\n"
+"Please connect your machine to a network with a DHCP server and retry."
+msgstr "Das Netzwerk konnte nicht gestartet werden, es ist aber für das Fortfahren erforderlich.\n\nBitte verbinden Sie den Computer mit einem Netzwerk mit DHCP und versuchen Sie es erneut."
+
+#: main.c:487 main.c:516
+msgid "Retry"
+msgstr "Erneut versuchen"
+
+#: main.c:501
+msgid "Downloading installation image..."
 msgstr "Lade Installationsimage herunter..."

-#: main.c:342
-msgid "Download error"
-msgstr "Fehler beim Download"
+#: main.c:510
+#, c-format
+msgid "MD5 checksum mismatch"
+msgstr "MD5-Prüfsummen stimmen nicht überein"

-#: main.c:376
+#: main.c:513
+#, c-format
+msgid ""
+"The installation image could not be downloaded.\n"
+"  Reason: %s\n"
+"\n"
+"%s"
+msgstr "Das Installationsabbild konnte nicht heruntergeladen werden.\nGrund: %s\n\n%s"
+
+#: main.c:528
+#, c-format
+msgid ""
+"Could not mount %s to %s:\n"
+"  %s\n"
+msgstr "Konnte %s nicht auf %s mounten:\n%s\n"
+
+#: main.c:543
 msgid "License Agreement"
 msgstr "Lizenzvereinbarung"

-#: main.c:377
+#: main.c:544
 msgid "License not accepted!"
 msgstr "Lizenz nicht akzeptiert!"

-#: main.c:399
+#: main.c:566
 msgid "No hard disk found."
 msgstr "Es wurde keine Festplatte gefunden."

-#: main.c:418
+#: main.c:587
 msgid "Disk Selection"
 msgstr "Festplattenauswahl"

-#: main.c:419
+#: main.c:588
 msgid ""
 "Select the disk(s) you want to install IPFire on. First those will be partitioned, and then the partitions will have a filesystem put on them.\n"
 "\n"
 "ALL DATA ON THE DISK WILL BE DESTROYED."
 msgstr "Wählen Sie die Festplatte(n) auf denen IPFire installiert werden soll. Diese wird/werden zuerst partitioniert und danach mit einem Dateisystem ausgestattet.\n\nSÄMTLICHE DATEN AUF DER FESTPLATTE GEHEN VERLOREN."

-#: main.c:430
+#: main.c:599
 msgid ""
 "No disk has been selected.\n"
 "\n"
 "Please select one or more disks you want to install IPFire on."
 msgstr "Keine Festplatte ausgewählt.\n\nBitte wählen Sie eine oder mehrere Festplatten auf denen IPFire installiert werden soll aus."

-#: main.c:443
+#: main.c:617
 #, c-format
 msgid ""
 "The installation program will now prepare the chosen harddisk:\n"
@@ -107,15 +168,15 @@ msgid ""
 "Do you agree to continue?"
 msgstr "Das Installationsprogramm wird die folgende  Festplatte nun vorbereiten:\n\n%s\n\nMöchten Sie damit fortfahren?"

-#: main.c:445
+#: main.c:619
 msgid "Disk Setup"
 msgstr "Disk-Setup"

-#: main.c:446 main.c:456
+#: main.c:620 main.c:630
 msgid "Delete all data"
 msgstr "Alle Daten löschen"

-#: main.c:453
+#: main.c:627
 #, c-format
 msgid ""
 "The installation program will now set up a RAID configuration on the selected harddisks:\n"
@@ -126,119 +187,146 @@ msgid ""
 "Do you agree to continue?"
 msgstr "Das Installationsprogramm wird nun einen RAID Verbund auf den folgenden Festplatten erstellen:\n\n%s\n%s\n\nMöchten Sie damit fortfahren?"

-#: main.c:455
+#: main.c:629
 msgid "RAID Setup"
 msgstr "RAID-Setup"

-#: main.c:466
-msgid "You disk configuration is currently not supported."
+#: main.c:640
+msgid "Your disk configuration is currently not supported."
 msgstr "Die gewählte Festplattenkonstellation wird momentan nicht unterstützt."

-#: main.c:480
+#: main.c:655
 msgid "Your harddisk is too small."
 msgstr "Ihre Festplatte ist zu klein."

-#: main.c:494
+#: main.c:671
 msgid ""
 "Your harddisk is very small, but you can continue without a swap partition."
 msgstr "Die gewählte Festplatte ist sehr klein, die Installation kann aber ohne Swap Partition fortgesetzt werden."

-#: main.c:506
+#: main.c:684
 msgid "ext4 Filesystem"
 msgstr "ext4-Dateisystem"

-#: main.c:507
+#: main.c:685
 msgid "ext4 Filesystem without journal"
 msgstr "ext4-Dateisystem ohne Journal"

-#: main.c:508
+#: main.c:686
 msgid "XFS Filesystem"
 msgstr "XFS-Dateisystem"

-#: main.c:509
+#: main.c:687
 msgid "ReiserFS Filesystem"
 msgstr "ReiserFS-Dateisystem"

-#: main.c:523
+#: main.c:701
 msgid "Filesystem Selection"
 msgstr "Dateisystemauswahl"

-#: main.c:523
+#: main.c:701
 msgid "Please choose your filesystem:"
 msgstr "Bitte wählen Sie ein Dateisystem:"

-#: main.c:534
+#: main.c:712
 msgid "Building RAID..."
 msgstr "Erstelle RAID..."

-#: main.c:538
+#: main.c:716
 msgid "Unable to build the RAID."
 msgstr "Das RAID konnte nicht erstellt werden."

-#: main.c:550
+#: main.c:728
 msgid "Partitioning disk..."
 msgstr "Partitioniere die Festplatte..."

-#: main.c:554
+#: main.c:732
 msgid "Unable to partition the disk."
 msgstr "Die Festplatte konnte nicht partitioniert werden."

-#: main.c:561
+#: main.c:739
 msgid "Creating filesystems..."
 msgstr "Erstelle Dateisysteme..."

-#: main.c:565
+#: main.c:743
 msgid "Unable to create filesystems."
 msgstr "Die Dateisysteme konnten nicht erstellt werden."

-#: main.c:571
+#: main.c:749
 msgid "Unable to mount filesystems."
 msgstr "Die Dateisysteme konnten nicht eingehangen werden."

-#: main.c:582
+#: main.c:760
 msgid "Installing the system..."
 msgstr "Installiere das System..."

-#: main.c:583
+#: main.c:761
 msgid "Unable to install the system."
 msgstr "Das System konnte nicht installiert werden."

-#: main.c:599
+#: main.c:777
 msgid "Installing the language cache..."
 msgstr "Installiere den Sprachdateicache..."

-#: main.c:600
+#: main.c:778
 msgid "Unable to install the language cache."
 msgstr "Der Sprachdateicache konnte nicht erstellt werden."

-#: main.c:605
+#: main.c:783
 msgid "Installing the bootloader..."
 msgstr "Installiere den Bootloader..."

-#: main.c:612
+#: main.c:790
 msgid "Unable to open /etc/default/grub for writing."
 msgstr "/etc/default/grub konnte nicht geschrieben werden."

-#: main.c:634
+#: main.c:812
 msgid "Unable to install the bootloader."
 msgstr "Der Bootloader konnte nicht installiert werden."

-#: main.c:666
+#: main.c:826
+msgid ""
+"A backup file has been found on the installation image.\n"
+"\n"
+"Do you want to restore the backup?"
+msgstr "Eine Sicherungskopie wurde auf dem Installationsmedium gefunden.\n\nMöchten Sie die Sicherungskopie wiederherstellen?"
+
+#: main.c:827
+msgid "Yes"
+msgstr "Ja"
+
+#: main.c:827
+msgid "No"
+msgstr "Nein"
+
+#: main.c:834
+msgid "An error occured when the backup file was restored."
+msgstr "Bei der Wiederherstellung der Sicherungskopie trat ein Fehler auf."
+
+#: main.c:869
+msgid "Running post-install script..."
+msgstr "Führe Post-Installations-Skripte aus..."
+
+#: main.c:870
+msgid "Post-install script failed."
+msgstr "Post-Installations-Skript fehlgeschlagen."
+
+#: main.c:877
 #, c-format
 msgid ""
 "%s was successfully installed!\n"
 "\n"
 "Please remove any installation mediums from this system and hit the reboot button. Once the system has restarted you will be asked to setup networking and system passwords. After that, you should point your web browser at https://%s:444 (or what ever you name your %s) for the web configuration console."
-msgstr "%s wurde erfolgreich installiert.\n\nEntfernen Sie bitte alle Installionsmedian aus dem Computer und drücken Sie den \"Neustarten\" Knopf . \n\nNach dem erfolgten Neustart wird das Setup-Programm gestartet, in dem Sie Netzwerkkarten und die Systempasswörter konfigurieren können. Sobald dies fertiggestellt ist, können Sie in Ihrem Webbrowser die Weboberfläche mit https://%s:444 (oder welchen Namen Sie Ihrem %s auch immer gegeben haben) erreichen."
+msgstr "%s wurde erfolgreich installiert.\n\nEntfernen Sie bitte alle Installionsmedien aus dem Computer und drücken Sie \"Neustarten\". \n\nNach dem erfolgten Neustart wird das Setup-Programm gestartet, in dem Sie Netzwerkkarten und die Systempasswörter konfigurieren können. Sobald dies fertiggestellt ist, können Sie in Ihrem Webbrowser die Weboberfläche über https://%s:444 (oder welchen Namen Sie Ihrem %s auch immer gegeben haben) erreichen."

-#: main.c:671
+#: main.c:882
 msgid "Congratulations!"
 msgstr "Herzlichen Glückwunsch!"

-#: main.c:671
+#: main.c:882
 msgid "Reboot"
 msgstr "Neustarten"

-#: main.c:682
+#: main.c:893
 msgid "Setup has failed. Press Ok to reboot."
 msgstr "Installation fehlgeschlagen. Drücken Sie \"OK\" für einen Neustart des Systems."
--- a/src/installer/po/el_GR.po
+++ b/src/installer/po/el_GR.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: IPFire Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-21 15:09+0000\n"
-"PO-Revision-Date: 2014-08-21 15:11+0000\n"
+"POT-Creation-Date: 2014-11-05 01:29+0000\n"
+"PO-Revision-Date: 2014-11-05 01:33+0000\n"
 "Last-Translator: Michael Tremer <michael.tremer@ipfire.org>\n"
 "Language-Team: Greek (Greece) (http://www.transifex.com/projects/p/ipfire/language/el_GR/)\n"
 "MIME-Version: 1.0\n"
@@ -17,31 +17,40 @@ msgstr ""
 "Language: el_GR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"

-#: main.c:77 main.c:148 main.c:313 main.c:339 main.c:493 main.c:524 main.c:682
+#: main.c:78 main.c:179 main.c:404 main.c:670 main.c:702 main.c:893
 msgid "OK"
 msgstr ""

-#: main.c:78 main.c:446 main.c:456 main.c:493 main.c:524
+#: main.c:79 main.c:460 main.c:487 main.c:516 main.c:620 main.c:630 main.c:670
+#: main.c:702
 msgid "Cancel"
 msgstr ""

-#: main.c:145
+#: main.c:176
 msgid "I accept this license"
 msgstr ""

-#: main.c:312
+#: main.c:384
+msgid "Warning: Unattended installation will start in 10 seconds..."
+msgstr ""
+
+#: main.c:403
 msgid "Language selection"
 msgstr ""

-#: main.c:312
+#: main.c:403
 msgid "Select the language you wish to use for the installation."
 msgstr ""

-#: main.c:323
+#: main.c:418
+msgid "Unattended mode"
+msgstr ""
+
+#: main.c:420
 msgid "<Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next screen"
 msgstr ""

-#: main.c:328
+#: main.c:426
 #, c-format
 msgid ""
 "Welcome to the %s installation program.\n"
@@ -49,53 +58,104 @@ msgid ""
 "Selecting Cancel on any of the following screens will reboot the computer."
 msgstr ""

-#: main.c:330
+#: main.c:428
 msgid "Start installation"
 msgstr ""

-#: main.c:339
-msgid "No local source media found. Starting download."
+#: main.c:449
+#, c-format
+msgid "The installer will now try downloading the installation image."
 msgstr ""

-#: main.c:340
-msgid "Downloading installation image ..."
+#: main.c:452
+#, c-format
+msgid ""
+"No source drive could be found.\n"
+"\n"
+"You can try downloading the required installation image."
 msgstr ""

-#: main.c:342
-msgid "Download error"
+#: main.c:456
+msgid ""
+"Please make sure to connect your machine to a network and the installer will"
+" try connect to acquire an IP address."
 msgstr ""

-#: main.c:376
+#: main.c:460
+msgid "Download installation image"
+msgstr ""
+
+#: main.c:473
+msgid "Trying to start networking (DHCP)..."
+msgstr ""
+
+#: main.c:484
+msgid ""
+"Networking could not be started but is required to go on with the installation.\n"
+"\n"
+"Please connect your machine to a network with a DHCP server and retry."
+msgstr ""
+
+#: main.c:487 main.c:516
+msgid "Retry"
+msgstr ""
+
+#: main.c:501
+msgid "Downloading installation image..."
+msgstr ""
+
+#: main.c:510
+#, c-format
+msgid "MD5 checksum mismatch"
+msgstr ""
+
+#: main.c:513
+#, c-format
+msgid ""
+"The installation image could not be downloaded.\n"
+"  Reason: %s\n"
+"\n"
+"%s"
+msgstr ""
+
+#: main.c:528
+#, c-format
+msgid ""
+"Could not mount %s to %s:\n"
+"  %s\n"
+msgstr ""
+
+#: main.c:543
 msgid "License Agreement"
 msgstr ""

-#: main.c:377
+#: main.c:544
 msgid "License not accepted!"
 msgstr ""

-#: main.c:399
+#: main.c:566
 msgid "No hard disk found."
 msgstr ""

-#: main.c:418
+#: main.c:587
 msgid "Disk Selection"
 msgstr ""

-#: main.c:419
+#: main.c:588
 msgid ""
 "Select the disk(s) you want to install IPFire on. First those will be partitioned, and then the partitions will have a filesystem put on them.\n"
 "\n"
 "ALL DATA ON THE DISK WILL BE DESTROYED."
 msgstr ""

-#: main.c:430
+#: main.c:599
 msgid ""
 "No disk has been selected.\n"
 "\n"
 "Please select one or more disks you want to install IPFire on."
 msgstr ""

-#: main.c:443
+#: main.c:617
 #, c-format
 msgid ""
 "The installation program will now prepare the chosen harddisk:\n"
@@ -105,15 +165,15 @@ msgid ""
 "Do you agree to continue?"
 msgstr ""

-#: main.c:445
+#: main.c:619
 msgid "Disk Setup"
 msgstr ""

-#: main.c:446 main.c:456
+#: main.c:620 main.c:630
 msgid "Delete all data"
 msgstr ""

-#: main.c:453
+#: main.c:627
 #, c-format
 msgid ""
 "The installation program will now set up a RAID configuration on the selected harddisks:\n"
@@ -124,104 +184,131 @@ msgid ""
 "Do you agree to continue?"
 msgstr ""

-#: main.c:455
+#: main.c:629
 msgid "RAID Setup"
 msgstr ""

-#: main.c:466
-msgid "You disk configuration is currently not supported."
+#: main.c:640
+msgid "Your disk configuration is currently not supported."
 msgstr ""

-#: main.c:480
+#: main.c:655
 msgid "Your harddisk is too small."
 msgstr ""

-#: main.c:494
+#: main.c:671
 msgid ""
 "Your harddisk is very small, but you can continue without a swap partition."
 msgstr ""

-#: main.c:506
+#: main.c:684
 msgid "ext4 Filesystem"
 msgstr ""

-#: main.c:507
+#: main.c:685
 msgid "ext4 Filesystem without journal"
 msgstr ""

-#: main.c:508
+#: main.c:686
 msgid "XFS Filesystem"
 msgstr ""

-#: main.c:509
+#: main.c:687
 msgid "ReiserFS Filesystem"
 msgstr ""

-#: main.c:523
+#: main.c:701
 msgid "Filesystem Selection"
 msgstr ""

-#: main.c:523
+#: main.c:701
 msgid "Please choose your filesystem:"
 msgstr ""

-#: main.c:534
+#: main.c:712
 msgid "Building RAID..."
 msgstr ""

-#: main.c:538
+#: main.c:716
 msgid "Unable to build the RAID."
 msgstr ""

-#: main.c:550
+#: main.c:728
 msgid "Partitioning disk..."
 msgstr ""

-#: main.c:554
+#: main.c:732
 msgid "Unable to partition the disk."
 msgstr ""

-#: main.c:561
+#: main.c:739
 msgid "Creating filesystems..."
 msgstr ""

-#: main.c:565
+#: main.c:743
 msgid "Unable to create filesystems."
 msgstr ""

-#: main.c:571
+#: main.c:749
 msgid "Unable to mount filesystems."
 msgstr ""

-#: main.c:582
+#: main.c:760
 msgid "Installing the system..."
 msgstr ""

-#: main.c:583
+#: main.c:761
 msgid "Unable to install the system."
 msgstr ""

-#: main.c:599
+#: main.c:777
 msgid "Installing the language cache..."
 msgstr ""

-#: main.c:600
+#: main.c:778
 msgid "Unable to install the language cache."
 msgstr ""

-#: main.c:605
+#: main.c:783
 msgid "Installing the bootloader..."
 msgstr ""

-#: main.c:612
+#: main.c:790
 msgid "Unable to open /etc/default/grub for writing."
 msgstr ""

-#: main.c:634
+#: main.c:812
 msgid "Unable to install the bootloader."
 msgstr ""

-#: main.c:666
+#: main.c:826
+msgid ""
+"A backup file has been found on the installation image.\n"
+"\n"
+"Do you want to restore the backup?"
+msgstr ""
+
+#: main.c:827
+msgid "Yes"
+msgstr ""
+
+#: main.c:827
+msgid "No"
+msgstr ""
+
+#: main.c:834
+msgid "An error occured when the backup file was restored."
+msgstr ""
+
+#: main.c:869
+msgid "Running post-install script..."
+msgstr ""
+
+#: main.c:870
+msgid "Post-install script failed."
+msgstr ""
+
+#: main.c:877
 #, c-format
 msgid ""
 "%s was successfully installed!\n"
@@ -229,14 +316,14 @@ msgid ""
 "Please remove any installation mediums from this system and hit the reboot button. Once the system has restarted you will be asked to setup networking and system passwords. After that, you should point your web browser at https://%s:444 (or what ever you name your %s) for the web configuration console."
 msgstr ""

-#: main.c:671
+#: main.c:882
 msgid "Congratulations!"
 msgstr ""

-#: main.c:671
+#: main.c:882
 msgid "Reboot"
 msgstr ""

-#: main.c:682
+#: main.c:893
 msgid "Setup has failed. Press Ok to reboot."
 msgstr ""
--- a/src/installer/po/es.po
+++ b/src/installer/po/es.po
@@ -3,13 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Roberto Peña <roberto.pena@northsecure.es>, 2015
+# Roberto Peña <roberto.pena@northsecure.es>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: IPFire Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-21 15:09+0000\n"
-"PO-Revision-Date: 2014-08-21 15:11+0000\n"
-"Last-Translator: Michael Tremer <michael.tremer@ipfire.org>\n"
+"POT-Creation-Date: 2014-11-05 01:29+0000\n"
+"PO-Revision-Date: 2015-02-01 09:23+0000\n"
+"Last-Translator: Roberto Peña <roberto.pena@northsecure.es>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/ipfire/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,85 +19,145 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"

-#: main.c:77 main.c:148 main.c:313 main.c:339 main.c:493 main.c:524 main.c:682
+#: main.c:78 main.c:179 main.c:404 main.c:670 main.c:702 main.c:893
 msgid "OK"
-msgstr ""
+msgstr "Ok"

-#: main.c:78 main.c:446 main.c:456 main.c:493 main.c:524
+#: main.c:79 main.c:460 main.c:487 main.c:516 main.c:620 main.c:630 main.c:670
+#: main.c:702
 msgid "Cancel"
-msgstr ""
+msgstr "Cancelar"

-#: main.c:145
+#: main.c:176
 msgid "I accept this license"
-msgstr ""
+msgstr "Acepto esta licencia"

-#: main.c:312
+#: main.c:384
+msgid "Warning: Unattended installation will start in 10 seconds..."
+msgstr "Advertencia: La instalación desatendida comenzará en 10 segundos..."
+
+#: main.c:403
 msgid "Language selection"
-msgstr ""
+msgstr "Selección de idioma"

-#: main.c:312
+#: main.c:403
 msgid "Select the language you wish to use for the installation."
-msgstr ""
+msgstr "Seleccione el idioma que quiere que se use durante la instalación."

-#: main.c:323
+#: main.c:418
+msgid "Unattended mode"
+msgstr "Modo desatendido"
+
+#: main.c:420
 msgid "<Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next screen"
-msgstr ""
+msgstr "<Tab>/<Alt-Tab> entre elementos | <Space> seleccionar  | <F12> siguiente pantalla"

-#: main.c:328
+#: main.c:426
 #, c-format
 msgid ""
 "Welcome to the %s installation program.\n"
 "\n"
 "Selecting Cancel on any of the following screens will reboot the computer."
-msgstr ""
+msgstr "Bienvenido al programa de instalación %s.\n\nAl seleccionar Cancelar en cualquiera de las siguientes pantallas se reiniciará el equipo."

-#: main.c:330
+#: main.c:428
 msgid "Start installation"
-msgstr ""
+msgstr "Comenzar la instalación"

-#: main.c:339
-msgid "No local source media found. Starting download."
-msgstr ""
+#: main.c:449
+#, c-format
+msgid "The installer will now try downloading the installation image."
+msgstr "El instalador no ha podido descargar la imagen de instalación."

-#: main.c:340
-msgid "Downloading installation image ..."
-msgstr ""
+#: main.c:452
+#, c-format
+msgid ""
+"No source drive could be found.\n"
+"\n"
+"You can try downloading the required installation image."
+msgstr "No se puede encontrar unidad de origen.\n\nPuede intentar descargar la imagen de instalación requerida."

-#: main.c:342
-msgid "Download error"
-msgstr ""
+#: main.c:456
+msgid ""
+"Please make sure to connect your machine to a network and the installer will"
+" try connect to acquire an IP address."
+msgstr "Por favor, asegúrese de conectar el equipo a una red y el instalador intentará conectarse adquiriendo una dirección IP."

-#: main.c:376
+#: main.c:460
+msgid "Download installation image"
+msgstr "Descargando la imagen de instalación"
+
+#: main.c:473
+msgid "Trying to start networking (DHCP)..."
+msgstr "Intentando iniciar la red (DHCP)..."
+
+#: main.c:484
+msgid ""
+"Networking could not be started but is required to go on with the installation.\n"
+"\n"
+"Please connect your machine to a network with a DHCP server and retry."
+msgstr "La red no se pudo iniciar, pero es necesaria para continuar con la instalación.\n\nPor favor, conecte el equipo a una red con un servidor DHCP y vuelva a intentarlo."
+
+#: main.c:487 main.c:516
+msgid "Retry"
+msgstr "Reintentar"
+
+#: main.c:501
+msgid "Downloading installation image..."
+msgstr "Descargando la imagen de instalación..."
+
+#: main.c:510
+#, c-format
+msgid "MD5 checksum mismatch"
+msgstr "Discordancia suma de verificación MD5 "
+
+#: main.c:513
+#, c-format
+msgid ""
+"The installation image could not be downloaded.\n"
+"  Reason: %s\n"
+"\n"
+"%s"
+msgstr "La imagen de instalación no puede ser descargada.\nRazón: %s\n\n%s"
+
+#: main.c:528
+#, c-format
+msgid ""
+"Could not mount %s to %s:\n"
+"  %s\n"
+msgstr "No se pudo montar %s to %s:\n%s\n"
+
+#: main.c:543
 msgid "License Agreement"
-msgstr ""
+msgstr "Contrato de licencia"

-#: main.c:377
+#: main.c:544
 msgid "License not accepted!"
-msgstr ""
+msgstr "Licencia no aceptada!"

-#: main.c:399
+#: main.c:566
 msgid "No hard disk found."
-msgstr ""
+msgstr "Disco duro no encontrado."

-#: main.c:418
+#: main.c:587
 msgid "Disk Selection"
-msgstr ""
+msgstr "Selección de disco"

-#: main.c:419
+#: main.c:588
 msgid ""
 "Select the disk(s) you want to install IPFire on. First those will be partitioned, and then the partitions will have a filesystem put on them.\n"
 "\n"
 "ALL DATA ON THE DISK WILL BE DESTROYED."
-msgstr ""
+msgstr "Seleccione el disco(s) donde quiere instalar IPFire. Primero deberán ser particionados y cuando tengan particiones, se les pondrá un sistema de archivos.\n\nTODOS LOS DATOS DEL DISCO SERÁN DESTRUIDOS."

-#: main.c:430
+#: main.c:599
 msgid ""
 "No disk has been selected.\n"
 "\n"
 "Please select one or more disks you want to install IPFire on."
-msgstr ""
+msgstr "No se ha seleccionado un disco.\n\nPor favor, seleccione uno o más discos donde quiere que se instale IPFire."

-#: main.c:443
+#: main.c:617
 #, c-format
 msgid ""
 "The installation program will now prepare the chosen harddisk:\n"
@@ -103,17 +165,17 @@ msgid ""
 "  %s\n"
 "\n"
 "Do you agree to continue?"
-msgstr ""
+msgstr "El programa de instalación preparará ahora los discos elegidos:\n\n%s\n\nQuiere continuar?"

-#: main.c:445
+#: main.c:619
 msgid "Disk Setup"
-msgstr ""
+msgstr "Disco de instalación"

-#: main.c:446 main.c:456
+#: main.c:620 main.c:630
 msgid "Delete all data"
-msgstr ""
+msgstr "Borrar todos los datos"

-#: main.c:453
+#: main.c:627
 #, c-format
 msgid ""
 "The installation program will now set up a RAID configuration on the selected harddisks:\n"
@@ -122,121 +184,148 @@ msgid ""
 "  %s\n"
 "\n"
 "Do you agree to continue?"
-msgstr ""
+msgstr "El programa de instalación establecerá ahora una configuración RAID en los discos duros seleccionados:\n\n%s\n%s\n\nEstá de acuerdo con continuar?"

-#: main.c:455
+#: main.c:629
 msgid "RAID Setup"
-msgstr ""
+msgstr "Configuración RAID"

-#: main.c:466
-msgid "You disk configuration is currently not supported."
-msgstr ""
+#: main.c:640
+msgid "Your disk configuration is currently not supported."
+msgstr "Su configuración del disco no es compatible actualmente."

-#: main.c:480
+#: main.c:655
 msgid "Your harddisk is too small."
-msgstr ""
+msgstr "Su disco duro es demasiado pequeño."

-#: main.c:494
+#: main.c:671
 msgid ""
 "Your harddisk is very small, but you can continue without a swap partition."
-msgstr ""
+msgstr "Su disco duro es muy pequeño, pero se puede continuar sin una partición de intercambio."

-#: main.c:506
+#: main.c:684
 msgid "ext4 Filesystem"
-msgstr ""
+msgstr "Sistema de archivos ext4"

-#: main.c:507
+#: main.c:685
 msgid "ext4 Filesystem without journal"
-msgstr ""
+msgstr "Sistema de archivos ext4 sin diario"

-#: main.c:508
+#: main.c:686
 msgid "XFS Filesystem"
-msgstr ""
+msgstr "Sistema de archivos XFS"

-#: main.c:509
+#: main.c:687
 msgid "ReiserFS Filesystem"
-msgstr ""
+msgstr "Sistema de archivos ReiserFS"

-#: main.c:523
+#: main.c:701
 msgid "Filesystem Selection"
-msgstr ""
+msgstr "Selección del sistema de archivos"

-#: main.c:523
+#: main.c:701
 msgid "Please choose your filesystem:"
-msgstr ""
+msgstr "Por favor, seleccione su sistema de archivos:"

-#: main.c:534
+#: main.c:712
 msgid "Building RAID..."
-msgstr ""
+msgstr "Construyendo RAID."

-#: main.c:538
+#: main.c:716
 msgid "Unable to build the RAID."
-msgstr ""
+msgstr "No se ha podido construir el RAID."

-#: main.c:550
+#: main.c:728
 msgid "Partitioning disk..."
-msgstr ""
+msgstr "Particionando disco..."

-#: main.c:554
+#: main.c:732
 msgid "Unable to partition the disk."
-msgstr ""
+msgstr "No se ha podido particionar el disco."

-#: main.c:561
+#: main.c:739
 msgid "Creating filesystems..."
-msgstr ""
+msgstr "Creando el sistema de archivos..."

-#: main.c:565
+#: main.c:743
 msgid "Unable to create filesystems."
-msgstr ""
+msgstr "No se ha podido crear el sistema de archivos."

-#: main.c:571
+#: main.c:749
 msgid "Unable to mount filesystems."
-msgstr ""
+msgstr "No se ha podido montar el sistema de archivos."

-#: main.c:582
+#: main.c:760
 msgid "Installing the system..."
-msgstr ""
+msgstr "Instalando el sistema..."

-#: main.c:583
+#: main.c:761
 msgid "Unable to install the system."
-msgstr ""
+msgstr "No se ha podido instalar el sistema."

-#: main.c:599
+#: main.c:777
 msgid "Installing the language cache..."
-msgstr ""
+msgstr "Instalando la caché del idioma..."

-#: main.c:600
+#: main.c:778
 msgid "Unable to install the language cache."
-msgstr ""
+msgstr "No se ha podido instalar la caché del idioma."

-#: main.c:605
+#: main.c:783
 msgid "Installing the bootloader..."
-msgstr ""
+msgstr "Instalando el bootloader..."

-#: main.c:612
+#: main.c:790
 msgid "Unable to open /etc/default/grub for writing."
-msgstr ""
+msgstr "No se ha podido abrir /etc/default/grub para escritura."

-#: main.c:634
+#: main.c:812
 msgid "Unable to install the bootloader."
-msgstr ""
+msgstr "No se ha podido instalar el bootloader."

-#: main.c:666
+#: main.c:826
+msgid ""
+"A backup file has been found on the installation image.\n"
+"\n"
+"Do you want to restore the backup?"
+msgstr "La imagen de instalación ha encontrado una copia de seguridad.\n\n¿Quiere restaurar la copia de seguridad?"
+
+#: main.c:827
+msgid "Yes"
+msgstr "Sí"
+
+#: main.c:827
+msgid "No"
+msgstr "No"
+
+#: main.c:834
+msgid "An error occured when the backup file was restored."
+msgstr "Se produjo un error cuando se restauró el archivo de copia de seguridad."
+
+#: main.c:869
+msgid "Running post-install script..."
+msgstr "Ejecutando post-script de instalación..."
+
+#: main.c:870
+msgid "Post-install script failed."
+msgstr "Ha fallado el Post-script de instalación."
+
+#: main.c:877
 #, c-format
 msgid ""
 "%s was successfully installed!\n"
 "\n"
 "Please remove any installation mediums from this system and hit the reboot button. Once the system has restarted you will be asked to setup networking and system passwords. After that, you should point your web browser at https://%s:444 (or what ever you name your %s) for the web configuration console."
-msgstr ""
+msgstr "%s fue instalado con éxito!\n\nPor favor, quite cualquier medio de instalación de este sistema y pulse el botón de reinicio. Una vez reiniciado el sistema, se le pedirá configurar la red y el sistema de contraseñas. Después de eso, para acceder a la consola de configuración, deberá introducir en su navegador web https://%s:444 (o cual sea el nombre de su %s)."

-#: main.c:671
+#: main.c:882
 msgid "Congratulations!"
-msgstr ""
+msgstr "¡Enhorabuena!"

-#: main.c:671
+#: main.c:882
 msgid "Reboot"
-msgstr ""
+msgstr "Reiniciar"

-#: main.c:682
+#: main.c:893
 msgid "Setup has failed. Press Ok to reboot."
-msgstr ""
+msgstr "La instalación ha fallado. Pulse Aceptar para reiniciar."
--- a/src/installer/po/fa.po
+++ b/src/installer/po/fa.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Khalil Delavaran <khalil.delavaran@gmail.com>, 2014
+# Khalil Delavaran <khalil.delavaran@gmail.com>, 2014-2015
 msgid ""
 msgstr ""
 "Project-Id-Version: IPFire Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-21 15:09+0000\n"
-"PO-Revision-Date: 2014-08-21 15:11+0000\n"
-"Last-Translator: Michael Tremer <michael.tremer@ipfire.org>\n"
+"POT-Creation-Date: 2014-11-05 01:29+0000\n"
+"PO-Revision-Date: 2015-01-26 07:48+0000\n"
+"Last-Translator: Khalil Delavaran <khalil.delavaran@gmail.com>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/ipfire/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,85 +18,145 @@ msgstr ""
 "Language: fa\n"
 "Plural-Forms: nplurals=1; plural=0;\n"

-#: main.c:77 main.c:148 main.c:313 main.c:339 main.c:493 main.c:524 main.c:682
+#: main.c:78 main.c:179 main.c:404 main.c:670 main.c:702 main.c:893
 msgid "OK"
 msgstr "بله"

-#: main.c:78 main.c:446 main.c:456 main.c:493 main.c:524
+#: main.c:79 main.c:460 main.c:487 main.c:516 main.c:620 main.c:630 main.c:670
+#: main.c:702
 msgid "Cancel"
 msgstr "نمی خواهم"

-#: main.c:145
+#: main.c:176
 msgid "I accept this license"
 msgstr "من این پروانه را می پذیرم."

-#: main.c:312
+#: main.c:384
+msgid "Warning: Unattended installation will start in 10 seconds..."
+msgstr "گوشزد: برپاسازی خودکار تا 10 ثانیه دیگر شروع می شود..."
+
+#: main.c:403
 msgid "Language selection"
-msgstr ""
+msgstr "گزینش زبان"

-#: main.c:312
+#: main.c:403
 msgid "Select the language you wish to use for the installation."
-msgstr ""
+msgstr "گزینش زبان شما برای بکارگیری در برپاسازی."

-#: main.c:323
+#: main.c:418
+msgid "Unattended mode"
+msgstr "حالت خودکار"
+
+#: main.c:420
 msgid "<Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next screen"
 msgstr "<Tab>/<Alt-Tab> میان عنصری  | <Space> گزینش | <F12>  برای برگه پسین"

-#: main.c:328
+#: main.c:426
 #, c-format
 msgid ""
 "Welcome to the %s installation program.\n"
 "\n"
 "Selecting Cancel on any of the following screens will reboot the computer."
-msgstr ""
+msgstr "به برنامه برپا سازی %s خوش آمدید.\n\nبرای راه اندازی دوباره کامپیوتر، نمی خواهم را در هر صفحه ای می توانید گزینش کنید."

-#: main.c:330
+#: main.c:428
 msgid "Start installation"
 msgstr "آغاز برپا سازی"

-#: main.c:339
-msgid "No local source media found. Starting download."
-msgstr "هیچ رسانه محلی یافت نشد. دانلود آغاز شد."
-
-#: main.c:340
-msgid "Downloading installation image ..."
-msgstr "در حال دانلود ایمیج برای برپا سازی..."
-
-#: main.c:342
-msgid "Download error"
-msgstr "ایراد در دانلود"
-
-#: main.c:376
-msgid "License Agreement"
+#: main.c:449
+#, c-format
+msgid "The installer will now try downloading the installation image."
 msgstr ""

-#: main.c:377
+#: main.c:452
+#, c-format
+msgid ""
+"No source drive could be found.\n"
+"\n"
+"You can try downloading the required installation image."
+msgstr "درایو منبع پیدا نشد.\n\nشما می توانید ایمیج مورد نیاز نصب را دانلود کنید. "
+
+#: main.c:456
+msgid ""
+"Please make sure to connect your machine to a network and the installer will"
+" try connect to acquire an IP address."
+msgstr ""
+
+#: main.c:460
+msgid "Download installation image"
+msgstr "دانلود ایمیج برپاسازی"
+
+#: main.c:473
+msgid "Trying to start networking (DHCP)..."
+msgstr "تلاش برای شروع شبکه (DHCP)..."
+
+#: main.c:484
+msgid ""
+"Networking could not be started but is required to go on with the installation.\n"
+"\n"
+"Please connect your machine to a network with a DHCP server and retry."
+msgstr "شبکه نمی تواند شروع کند، و رفتن به نصب ضروری می باشد.\n\nخواهشمند است سیستم را به یک شبکه با DHCP سرور وصل کرده و دوباره تلاش کنید."
+
+#: main.c:487 main.c:516
+msgid "Retry"
+msgstr "دوباره"
+
+#: main.c:501
+msgid "Downloading installation image..."
+msgstr "در حال دانلود ایمیج برای برپا سازی..."
+
+#: main.c:510
+#, c-format
+msgid "MD5 checksum mismatch"
+msgstr "ناهماهنگی در کنرل جمعی MD5"
+
+#: main.c:513
+#, c-format
+msgid ""
+"The installation image could not be downloaded.\n"
+"  Reason: %s\n"
+"\n"
+"%s"
+msgstr "ایمیج برپاسازی را نمی توان دانلود کرد.\nزیرا: %s\n\n%s"
+
+#: main.c:528
+#, c-format
+msgid ""
+"Could not mount %s to %s:\n"
+"  %s\n"
+msgstr "نمی توان %s را به %s مونت کرد:\n%s\n"
+
+#: main.c:543
+msgid "License Agreement"
+msgstr "موافقنامه"
+
+#: main.c:544
 msgid "License not accepted!"
 msgstr "پروانه پذیرفته نشد!"

-#: main.c:399
+#: main.c:566
 msgid "No hard disk found."
 msgstr "هارد دیسک یافت نشد."

-#: main.c:418
+#: main.c:587
 msgid "Disk Selection"
 msgstr "گزینش دیسک"

-#: main.c:419
+#: main.c:588
 msgid ""
 "Select the disk(s) you want to install IPFire on. First those will be partitioned, and then the partitions will have a filesystem put on them.\n"
 "\n"
 "ALL DATA ON THE DISK WILL BE DESTROYED."
 msgstr "دیسک (های) را برای برپاسازی IPFire گزینش کنید. نخست آنها را پارنیشین بندی کرده، و سپس، سیستم فایلی برای پارتیشن ها برگزینید.\n\nهمه داده های دیسک پاک می شوند."

-#: main.c:430
+#: main.c:599
 msgid ""
 "No disk has been selected.\n"
 "\n"
 "Please select one or more disks you want to install IPFire on."
 msgstr "هیچ دیسکی گزینش نشده است.\n\nخواهشمند است یک دیسک یا بیشتر را برای برپا سازی IPFire گزینش کنید."

-#: main.c:443
+#: main.c:617
 #, c-format
 msgid ""
 "The installation program will now prepare the chosen harddisk:\n"
@@ -106,15 +166,15 @@ msgid ""
 "Do you agree to continue?"
 msgstr "آماده سازی دیسک سخت برای برپا سازی برنامه :\n\n%s\n\nآیا شما گرایش به ادامه دارید؟"

-#: main.c:445
+#: main.c:619
 msgid "Disk Setup"
 msgstr "پیکربندی دیسک"

-#: main.c:446 main.c:456
+#: main.c:620 main.c:630
 msgid "Delete all data"
 msgstr "پاک کردن همه داده ها"

-#: main.c:453
+#: main.c:627
 #, c-format
 msgid ""
 "The installation program will now set up a RAID configuration on the selected harddisks:\n"
@@ -125,119 +185,146 @@ msgid ""
 "Do you agree to continue?"
 msgstr "پیکربندی RAID بر روی هارد دیسکهای گزینش شده برای برپا سازی برنامه\n\n%s\n%s\n\nآیا شما گرایش به ادامه دارید؟"

-#: main.c:455
+#: main.c:629
 msgid "RAID Setup"
 msgstr "پیکربندی RAID"

-#: main.c:466
-msgid "You disk configuration is currently not supported."
+#: main.c:640
+msgid "Your disk configuration is currently not supported."
 msgstr "پیکربندی دیسک شما پشتیبانی نمی شود."

-#: main.c:480
+#: main.c:655
 msgid "Your harddisk is too small."
 msgstr "هارد دیسک شما بسیار کوچک است."

-#: main.c:494
+#: main.c:671
 msgid ""
 "Your harddisk is very small, but you can continue without a swap partition."
-msgstr ""
+msgstr "هارد دیسک شما بسیار کوچک است، ولی می توانید بدون ساخت swap پارتیشن ادامه دهید."

-#: main.c:506
+#: main.c:684
 msgid "ext4 Filesystem"
 msgstr "فایل سیستم ext4"

-#: main.c:507
+#: main.c:685
 msgid "ext4 Filesystem without journal"
 msgstr "سیستم فایل ext4 بدون روزنامه"

-#: main.c:508
+#: main.c:686
 msgid "XFS Filesystem"
 msgstr "فایل سیستم XFS"

-#: main.c:509
+#: main.c:687
 msgid "ReiserFS Filesystem"
 msgstr "فایل سیستم RaiserFS"

-#: main.c:523
+#: main.c:701
 msgid "Filesystem Selection"
 msgstr "گزینش فایل سیستم"

-#: main.c:523
+#: main.c:701
 msgid "Please choose your filesystem:"
 msgstr "خواهشمند است فایل سیستم خود را گزینش کنید:"

-#: main.c:534
+#: main.c:712
 msgid "Building RAID..."
 msgstr "ساخت RAID..."

-#: main.c:538
+#: main.c:716
 msgid "Unable to build the RAID."
 msgstr "ناتوانی در ساخت RAID."

-#: main.c:550
+#: main.c:728
 msgid "Partitioning disk..."
 msgstr "پارتیشن بندی دیسک..."

-#: main.c:554
+#: main.c:732
 msgid "Unable to partition the disk."
 msgstr "ناتوانی در پارتیشین بندی دیسک."

-#: main.c:561
+#: main.c:739
 msgid "Creating filesystems..."
 msgstr "ساخت سیستم فایل..."

-#: main.c:565
+#: main.c:743
 msgid "Unable to create filesystems."
 msgstr "ناتوانی در ساخت سیستم فایل."

-#: main.c:571
+#: main.c:749
 msgid "Unable to mount filesystems."
 msgstr "ناتوانی در مونت کردن سیستم فایل."

-#: main.c:582
+#: main.c:760
 msgid "Installing the system..."
 msgstr "برپا سازی سیستم..."

-#: main.c:583
+#: main.c:761
 msgid "Unable to install the system."
 msgstr "ناتوانی در برپاسازی سیستم."

-#: main.c:599
+#: main.c:777
 msgid "Installing the language cache..."
 msgstr "در حال برپا سازی کش زبان..."

-#: main.c:600
+#: main.c:778
 msgid "Unable to install the language cache."
 msgstr "ناتوانی در برپا سازی کش زبان."

-#: main.c:605
+#: main.c:783
 msgid "Installing the bootloader..."
 msgstr "برپا سازی بوت لودر..."

-#: main.c:612
+#: main.c:790
 msgid "Unable to open /etc/default/grub for writing."
-msgstr ""
+msgstr "نمی توان /etc/default/grub را برای ویرایش باز کرد."

-#: main.c:634
+#: main.c:812
 msgid "Unable to install the bootloader."
 msgstr "ناتوانی در برپا سازی بوت لودر."

-#: main.c:666
+#: main.c:826
+msgid ""
+"A backup file has been found on the installation image.\n"
+"\n"
+"Do you want to restore the backup?"
+msgstr "یک فایل بک آپ در ایمیج نصب پیدا شد.\n\nآیا می خواهید بک آپ را بازیابی کنید؟"
+
+#: main.c:827
+msgid "Yes"
+msgstr "بله"
+
+#: main.c:827
+msgid "No"
+msgstr "خیر"
+
+#: main.c:834
+msgid "An error occured when the backup file was restored."
+msgstr "در هنگامه بازیابی فایل بک آپ شکستی رخ داده است."
+
+#: main.c:869
+msgid "Running post-install script..."
+msgstr "اجرای اسکریپت پس از نصب ..."
+
+#: main.c:870
+msgid "Post-install script failed."
+msgstr "اسکریپت پس از نصب شکست خورد."
+
+#: main.c:877
 #, c-format
 msgid ""
 "%s was successfully installed!\n"
 "\n"
 "Please remove any installation mediums from this system and hit the reboot button. Once the system has restarted you will be asked to setup networking and system passwords. After that, you should point your web browser at https://%s:444 (or what ever you name your %s) for the web configuration console."
-msgstr ""
+msgstr "%s برپا سازی شده است!\n\nخواهشمند است هر برپاسازی میانه ای از سیستم را پاک کنید و دکمه ریبوت را بزنید. پس از یک بار ریستارت سیستم، شما به پرسش های پیکربندی شبکه و گذر واژه سیستم پاسخ دهید. سپس برای پیکربندی پیشخوان وب، باید در مرورگر خود آدرس https://%s:444 (یا هر نامیکه گزینشی شما %s )را بنویسید."

-#: main.c:671
+#: main.c:882
 msgid "Congratulations!"
 msgstr "شادباش می گوییم!"

-#: main.c:671
+#: main.c:882
 msgid "Reboot"
 msgstr "ریبوت"

-#: main.c:682
+#: main.c:893
 msgid "Setup has failed. Press Ok to reboot."
-msgstr ""
+msgstr "برپا سازی شکست خورد. برای راه اندازی دوباره بلی را فشار دهید."
--- a/src/installer/po/fr.po
+++ b/src/installer/po/fr.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: IPFire Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-21 15:09+0000\n"
-"PO-Revision-Date: 2014-08-21 15:11+0000\n"
+"POT-Creation-Date: 2014-11-05 01:29+0000\n"
+"PO-Revision-Date: 2014-11-05 01:33+0000\n"
 "Last-Translator: Michael Tremer <michael.tremer@ipfire.org>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/ipfire/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -17,31 +17,40 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"

-#: main.c:77 main.c:148 main.c:313 main.c:339 main.c:493 main.c:524 main.c:682
+#: main.c:78 main.c:179 main.c:404 main.c:670 main.c:702 main.c:893
 msgid "OK"
 msgstr ""

-#: main.c:78 main.c:446 main.c:456 main.c:493 main.c:524
+#: main.c:79 main.c:460 main.c:487 main.c:516 main.c:620 main.c:630 main.c:670
+#: main.c:702
 msgid "Cancel"
 msgstr ""

-#: main.c:145
+#: main.c:176
 msgid "I accept this license"
 msgstr ""

-#: main.c:312
+#: main.c:384
+msgid "Warning: Unattended installation will start in 10 seconds..."
+msgstr ""
+
+#: main.c:403
 msgid "Language selection"
 msgstr ""

-#: main.c:312
+#: main.c:403
 msgid "Select the language you wish to use for the installation."
 msgstr ""

-#: main.c:323
+#: main.c:418
+msgid "Unattended mode"
+msgstr ""
+
+#: main.c:420
 msgid "<Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next screen"
 msgstr ""

-#: main.c:328
+#: main.c:426
 #, c-format
 msgid ""
 "Welcome to the %s installation program.\n"
@@ -49,53 +58,104 @@ msgid ""
 "Selecting Cancel on any of the following screens will reboot the computer."
 msgstr ""

-#: main.c:330
+#: main.c:428
 msgid "Start installation"
 msgstr ""

-#: main.c:339
-msgid "No local source media found. Starting download."
+#: main.c:449
+#, c-format
+msgid "The installer will now try downloading the installation image."
 msgstr ""

-#: main.c:340
-msgid "Downloading installation image ..."
+#: main.c:452
+#, c-format
+msgid ""
+"No source drive could be found.\n"
+"\n"
+"You can try downloading the required installation image."
 msgstr ""

-#: main.c:342
-msgid "Download error"
+#: main.c:456
+msgid ""
+"Please make sure to connect your machine to a network and the installer will"
+" try connect to acquire an IP address."
 msgstr ""

-#: main.c:376
+#: main.c:460
+msgid "Download installation image"
+msgstr ""
+
+#: main.c:473
+msgid "Trying to start networking (DHCP)..."
+msgstr ""
+
+#: main.c:484
+msgid ""
+"Networking could not be started but is required to go on with the installation.\n"
+"\n"
+"Please connect your machine to a network with a DHCP server and retry."
+msgstr ""
+
+#: main.c:487 main.c:516
+msgid "Retry"
+msgstr ""
+
+#: main.c:501
+msgid "Downloading installation image..."
+msgstr ""
+
+#: main.c:510
+#, c-format
+msgid "MD5 checksum mismatch"
+msgstr ""
+
+#: main.c:513
+#, c-format
+msgid ""
+"The installation image could not be downloaded.\n"
+"  Reason: %s\n"
+"\n"
+"%s"
+msgstr ""
+
+#: main.c:528
+#, c-format
+msgid ""
+"Could not mount %s to %s:\n"
+"  %s\n"
+msgstr ""
+
+#: main.c:543
 msgid "License Agreement"
 msgstr ""

-#: main.c:377
+#: main.c:544
 msgid "License not accepted!"
 msgstr ""

-#: main.c:399
+#: main.c:566
 msgid "No hard disk found."
 msgstr ""

-#: main.c:418
+#: main.c:587
 msgid "Disk Selection"
 msgstr ""

-#: main.c:419
+#: main.c:588
 msgid ""
 "Select the disk(s) you want to install IPFire on. First those will be partitioned, and then the partitions will have a filesystem put on them.\n"
 "\n"
 "ALL DATA ON THE DISK WILL BE DESTROYED."
 msgstr ""

-#: main.c:430
+#: main.c:599
 msgid ""
 "No disk has been selected.\n"
 "\n"
 "Please select one or more disks you want to install IPFire on."
 msgstr ""

-#: main.c:443
+#: main.c:617
 #, c-format
 msgid ""
 "The installation program will now prepare the chosen harddisk:\n"
@@ -105,15 +165,15 @@ msgid ""
 "Do you agree to continue?"
 msgstr ""

-#: main.c:445
+#: main.c:619
 msgid "Disk Setup"
 msgstr ""

-#: main.c:446 main.c:456
+#: main.c:620 main.c:630
 msgid "Delete all data"
 msgstr ""

-#: main.c:453
+#: main.c:627
 #, c-format
 msgid ""
 "The installation program will now set up a RAID configuration on the selected harddisks:\n"
@@ -124,104 +184,131 @@ msgid ""
 "Do you agree to continue?"
 msgstr ""

-#: main.c:455
+#: main.c:629
 msgid "RAID Setup"
 msgstr ""

-#: main.c:466
-msgid "You disk configuration is currently not supported."
+#: main.c:640
+msgid "Your disk configuration is currently not supported."
 msgstr ""

-#: main.c:480
+#: main.c:655
 msgid "Your harddisk is too small."
 msgstr ""

-#: main.c:494
+#: main.c:671
 msgid ""
 "Your harddisk is very small, but you can continue without a swap partition."
 msgstr ""

-#: main.c:506
+#: main.c:684
 msgid "ext4 Filesystem"
 msgstr ""

-#: main.c:507
+#: main.c:685
 msgid "ext4 Filesystem without journal"
 msgstr ""

-#: main.c:508
+#: main.c:686
 msgid "XFS Filesystem"
 msgstr ""

-#: main.c:509
+#: main.c:687
 msgid "ReiserFS Filesystem"
 msgstr ""

-#: main.c:523
+#: main.c:701
 msgid "Filesystem Selection"
 msgstr ""

-#: main.c:523
+#: main.c:701
 msgid "Please choose your filesystem:"
 msgstr ""

-#: main.c:534
+#: main.c:712
 msgid "Building RAID..."
 msgstr ""

-#: main.c:538
+#: main.c:716
 msgid "Unable to build the RAID."
 msgstr ""

-#: main.c:550
+#: main.c:728
 msgid "Partitioning disk..."
 msgstr ""

-#: main.c:554
+#: main.c:732
 msgid "Unable to partition the disk."
 msgstr ""

-#: main.c:561
+#: main.c:739
 msgid "Creating filesystems..."
 msgstr ""

-#: main.c:565
+#: main.c:743
 msgid "Unable to create filesystems."
 msgstr ""

-#: main.c:571
+#: main.c:749
 msgid "Unable to mount filesystems."
 msgstr ""

-#: main.c:582
+#: main.c:760
 msgid "Installing the system..."
 msgstr ""

-#: main.c:583
+#: main.c:761
 msgid "Unable to install the system."
 msgstr ""

-#: main.c:599
+#: main.c:777
 msgid "Installing the language cache..."
 msgstr ""

-#: main.c:600
+#: main.c:778
 msgid "Unable to install the language cache."
 msgstr ""

-#: main.c:605
+#: main.c:783
 msgid "Installing the bootloader..."
 msgstr ""

-#: main.c:612
+#: main.c:790
 msgid "Unable to open /etc/default/grub for writing."
 msgstr ""

-#: main.c:634
+#: main.c:812
 msgid "Unable to install the bootloader."
 msgstr ""

-#: main.c:666
+#: main.c:826
+msgid ""
+"A backup file has been found on the installation image.\n"
+"\n"
+"Do you want to restore the backup?"
+msgstr ""
+
+#: main.c:827
+msgid "Yes"
+msgstr ""
+
+#: main.c:827
+msgid "No"
+msgstr ""
+
+#: main.c:834
+msgid "An error occured when the backup file was restored."
+msgstr ""
+
+#: main.c:869
+msgid "Running post-install script..."
+msgstr ""
+
+#: main.c:870
+msgid "Post-install script failed."
+msgstr ""
+
+#: main.c:877
 #, c-format
 msgid ""
 "%s was successfully installed!\n"
@@ -229,14 +316,14 @@ msgid ""
 "Please remove any installation mediums from this system and hit the reboot button. Once the system has restarted you will be asked to setup networking and system passwords. After that, you should point your web browser at https://%s:444 (or what ever you name your %s) for the web configuration console."
 msgstr ""

-#: main.c:671
+#: main.c:882
 msgid "Congratulations!"
 msgstr ""

-#: main.c:671
+#: main.c:882
 msgid "Reboot"
 msgstr ""

-#: main.c:682
+#: main.c:893
 msgid "Setup has failed. Press Ok to reboot."
 msgstr ""
--- a/src/installer/po/hr.po
+++ b/src/installer/po/hr.po
@@ -0,0 +1,329 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR The IPFire Project (www.ipfire.org)
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: IPFire Project\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-05 01:29+0000\n"
+"PO-Revision-Date: 2015-01-26 12:07+0000\n"
+"Last-Translator: Blago Culjak <blago.culjak@hotmail.com>\n"
+"Language-Team: Croatian (http://www.transifex.com/projects/p/ipfire/language/hr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hr\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+
+#: main.c:78 main.c:179 main.c:404 main.c:670 main.c:702 main.c:893
+msgid "OK"
+msgstr "OK"
+
+#: main.c:79 main.c:460 main.c:487 main.c:516 main.c:620 main.c:630 main.c:670
+#: main.c:702
+msgid "Cancel"
+msgstr "Otkazati"
+
+#: main.c:176
+msgid "I accept this license"
+msgstr "Prihvaćam ovu licencu"
+
+#: main.c:384
+msgid "Warning: Unattended installation will start in 10 seconds..."
+msgstr "Upozoranje: Nenadgledana instalacija će započeti za 10 sekundi..."
+
+#: main.c:403
+msgid "Language selection"
+msgstr "Odabir jezika"
+
+#: main.c:403
+msgid "Select the language you wish to use for the installation."
+msgstr "Odaberite jezik koji želite koristiti za instalaciju."
+
+#: main.c:418
+msgid "Unattended mode"
+msgstr "Nenadgledana instalacija"
+
+#: main.c:420
+msgid "<Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next screen"
+msgstr "<Tab>/<Alt-Tab> Između odabira | <Space> Izaberi | <F12> Idući ekran"
+
+#: main.c:426
+#, c-format
+msgid ""
+"Welcome to the %s installation program.\n"
+"\n"
+"Selecting Cancel on any of the following screens will reboot the computer."
+msgstr "Dobrodošli u %s instalacijski programa..\n\nOdabirom Otkazati na bilo kojem od sljedećih ekranima će se ponovno pokrenuti računalo."
+
+#: main.c:428
+msgid "Start installation"
+msgstr "Pokrenite instalaciju"
+
+#: main.c:449
+#, c-format
+msgid "The installer will now try downloading the installation image."
+msgstr "Instalacija će pokušati preuzeti instalacijsku sliku."
+
+#: main.c:452
+#, c-format
+msgid ""
+"No source drive could be found.\n"
+"\n"
+"You can try downloading the required installation image."
+msgstr "Izvorišni pogon nije pronađen.\n\nMožete pokušati preuzeti instalacijsku sliku."
+
+#: main.c:456
+msgid ""
+"Please make sure to connect your machine to a network and the installer will"
+" try connect to acquire an IP address."
+msgstr "Provjerite da li ste priključeni na mrežu, instalacija će pokušati dobiti IP adresu."
+
+#: main.c:460
+msgid "Download installation image"
+msgstr "Preuzimanje instalacijske slike"
+
+#: main.c:473
+msgid "Trying to start networking (DHCP)..."
+msgstr "Pokušaj starta mreže (DHCP)..."
+
+#: main.c:484
+msgid ""
+"Networking could not be started but is required to go on with the installation.\n"
+"\n"
+"Please connect your machine to a network with a DHCP server and retry."
+msgstr "Mreža nije mogla biti pokrenuta a obvezna je za nastavak instalacije. \n\nPriključite se na mrežu s omogućenim DHCPom i pokušajte ponovno."
+
+#: main.c:487 main.c:516
+msgid "Retry"
+msgstr "Ponovno"
+
+#: main.c:501
+msgid "Downloading installation image..."
+msgstr "Preuzimanje instalacijske slike"
+
+#: main.c:510
+#, c-format
+msgid "MD5 checksum mismatch"
+msgstr "MD5 checksum se ne podudara"
+
+#: main.c:513
+#, c-format
+msgid ""
+"The installation image could not be downloaded.\n"
+"  Reason: %s\n"
+"\n"
+"%s"
+msgstr "Instalacijska slika nije preuzeta.\n  Razlog: %s\n\n%s"
+
+#: main.c:528
+#, c-format
+msgid ""
+"Could not mount %s to %s:\n"
+"  %s\n"
+msgstr "Nemogu monitari %s na %s:\n  %s\n"
+
+#: main.c:543
+msgid "License Agreement"
+msgstr "Ugovor o licenci"
+
+#: main.c:544
+msgid "License not accepted!"
+msgstr "Licenca nije prihvaćena!"
+
+#: main.c:566
+msgid "No hard disk found."
+msgstr "Tvrdi disk nije pronađen."
+
+#: main.c:587
+msgid "Disk Selection"
+msgstr "Izbor diska"
+
+#: main.c:588
+msgid ""
+"Select the disk(s) you want to install IPFire on. First those will be partitioned, and then the partitions will have a filesystem put on them.\n"
+"\n"
+"ALL DATA ON THE DISK WILL BE DESTROYED."
+msgstr "Odaberite disk(ove) na koje želite instalirati IPFire. Prvo će biti podijeljeni, a zatim particije će se datotečni sustav staviti na njih.\n\nSVI PODACI NA DISKU ĆE BITI UNIŠTENI!"
+
+#: main.c:599
+msgid ""
+"No disk has been selected.\n"
+"\n"
+"Please select one or more disks you want to install IPFire on."
+msgstr "Disk nije izabran. \n\nOdaberite jedan ili više diskova na koje želite instalirati na IPFire."
+
+#: main.c:617
+#, c-format
+msgid ""
+"The installation program will now prepare the chosen harddisk:\n"
+"\n"
+"  %s\n"
+"\n"
+"Do you agree to continue?"
+msgstr "Instalacijski program će sada pripremiti odabrani tvrdi disk:\n\n  %s\n\nSlažete li da nastavimo?"
+
+#: main.c:619
+msgid "Disk Setup"
+msgstr "Postavke diska"
+
+#: main.c:620 main.c:630
+msgid "Delete all data"
+msgstr "Izbriši sve podatke"
+
+#: main.c:627
+#, c-format
+msgid ""
+"The installation program will now set up a RAID configuration on the selected harddisks:\n"
+"\n"
+"  %s\n"
+"  %s\n"
+"\n"
+"Do you agree to continue?"
+msgstr "Instalacijski program će se sada postaviti RAID konfiguraciju na odabranim tvrdim diskovima:\n\n  %s\n  %s\n\nSlažete li da nastavimo?"
+
+#: main.c:629
+msgid "RAID Setup"
+msgstr "Postavljanje RAIDa"
+
+#: main.c:640
+msgid "Your disk configuration is currently not supported."
+msgstr "Vaša diskovna konfiguracija nije podržana."
+
+#: main.c:655
+msgid "Your harddisk is too small."
+msgstr "Vaš tvrdi disk je premali."
+
+#: main.c:671
+msgid ""
+"Your harddisk is very small, but you can continue without a swap partition."
+msgstr "Vaš tvrdi disk je dosta mali, ali možete nastaviti bez swap particije."
+
+#: main.c:684
+msgid "ext4 Filesystem"
+msgstr "ext4 datotečni sustav"
+
+#: main.c:685
+msgid "ext4 Filesystem without journal"
+msgstr "ext4 datotečni sustav bez journal-a"
+
+#: main.c:686
+msgid "XFS Filesystem"
+msgstr "XFS datotečni sustav"
+
+#: main.c:687
+msgid "ReiserFS Filesystem"
+msgstr "ReiserFS datotečni sustav"
+
+#: main.c:701
+msgid "Filesystem Selection"
+msgstr "Izabir datotečnog sustava"
+
+#: main.c:701
+msgid "Please choose your filesystem:"
+msgstr "Molimo odaberite svoj datotečni sustav:"
+
+#: main.c:712
+msgid "Building RAID..."
+msgstr "Izgradnja RAIDa..."
+
+#: main.c:716
+msgid "Unable to build the RAID."
+msgstr "Nije moguće izgraditi RAID."
+
+#: main.c:728
+msgid "Partitioning disk..."
+msgstr "Particioniranje diska ..."
+
+#: main.c:732
+msgid "Unable to partition the disk."
+msgstr "Nije moguće particionirati disk."
+
+#: main.c:739
+msgid "Creating filesystems..."
+msgstr "Izrada datotečnog sustava ..."
+
+#: main.c:743
+msgid "Unable to create filesystems."
+msgstr "Nije moguće stvoriti datotečni sustav."
+
+#: main.c:749
+msgid "Unable to mount filesystems."
+msgstr "Nije moguće montirati datotečni sustav."
+
+#: main.c:760
+msgid "Installing the system..."
+msgstr "Instaliranje sustava..."
+
+#: main.c:761
+msgid "Unable to install the system."
+msgstr "Nije moguće instalirati sustav."
+
+#: main.c:777
+msgid "Installing the language cache..."
+msgstr "Instaliranje cache-a jezika..."
+
+#: main.c:778
+msgid "Unable to install the language cache."
+msgstr "Nije moguće instalirati cache jezika."
+
+#: main.c:783
+msgid "Installing the bootloader..."
+msgstr "Instaliranje bootloadera..."
+
+#: main.c:790
+msgid "Unable to open /etc/default/grub for writing."
+msgstr "Ne mogu otvoriti /etc/default/grub grub za pisanje."
+
+#: main.c:812
+msgid "Unable to install the bootloader."
+msgstr "Nije moguće instalirati bootloader."
+
+#: main.c:826
+msgid ""
+"A backup file has been found on the installation image.\n"
+"\n"
+"Do you want to restore the backup?"
+msgstr "Pričuvna kopija je pronađena na instalacijskoj slici.\n\nDa li želite povratiti kopiju?"
+
+#: main.c:827
+msgid "Yes"
+msgstr "Da"
+
+#: main.c:827
+msgid "No"
+msgstr "Ne"
+
+#: main.c:834
+msgid "An error occured when the backup file was restored."
+msgstr "Greška pri povratu pričuvne kopije."
+
+#: main.c:869
+msgid "Running post-install script..."
+msgstr "Izvodim post-instalacijske skripte."
+
+#: main.c:870
+msgid "Post-install script failed."
+msgstr "Post-instalacijske skripte nisu uspješno izvršene."
+
+#: main.c:877
+#, c-format
+msgid ""
+"%s was successfully installed!\n"
+"\n"
+"Please remove any installation mediums from this system and hit the reboot button. Once the system has restarted you will be asked to setup networking and system passwords. After that, you should point your web browser at https://%s:444 (or what ever you name your %s) for the web configuration console."
+msgstr "%s uspješno je instaliran!\n\nMolimo uklonite sve instalacijske medije iz tog sustava i pritisnite gumb ponovno podizanje sustava. Nakon što je sustav ponovno podigne, od vas će biti zatraženo postavljanje mreže i lozinke sustava. Nakon toga, trebali usmjerite svoj web preglednik nahttps://%s:444  (ili koje god ste nazvali vaš %s) za postavke preko weba."
+
+#: main.c:882
+msgid "Congratulations!"
+msgstr "Čestitamo!"
+
+#: main.c:882
+msgid "Reboot"
+msgstr "Ponovno pokretanje"
+
+#: main.c:893
+msgid "Setup has failed. Press Ok to reboot."
+msgstr "Postavljanje nije uspjelo. Pritisnite OK za ponovno podizanje sustava."
--- a/src/installer/po/hu.po
+++ b/src/installer/po/hu.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: IPFire Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-21 15:09+0000\n"
-"PO-Revision-Date: 2014-08-21 15:11+0000\n"
+"POT-Creation-Date: 2014-11-05 01:29+0000\n"
+"PO-Revision-Date: 2014-11-05 01:33+0000\n"
 "Last-Translator: Michael Tremer <michael.tremer@ipfire.org>\n"
 "Language-Team: Hungarian (http://www.transifex.com/projects/p/ipfire/language/hu/)\n"
 "MIME-Version: 1.0\n"
@@ -17,31 +17,40 @@ msgstr ""
 "Language: hu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"

-#: main.c:77 main.c:148 main.c:313 main.c:339 main.c:493 main.c:524 main.c:682
+#: main.c:78 main.c:179 main.c:404 main.c:670 main.c:702 main.c:893
 msgid "OK"
 msgstr ""

-#: main.c:78 main.c:446 main.c:456 main.c:493 main.c:524
+#: main.c:79 main.c:460 main.c:487 main.c:516 main.c:620 main.c:630 main.c:670
+#: main.c:702
 msgid "Cancel"
 msgstr ""

-#: main.c:145
+#: main.c:176
 msgid "I accept this license"
 msgstr ""

-#: main.c:312
+#: main.c:384
+msgid "Warning: Unattended installation will start in 10 seconds..."
+msgstr ""
+
+#: main.c:403
 msgid "Language selection"
 msgstr ""

-#: main.c:312
+#: main.c:403
 msgid "Select the language you wish to use for the installation."
 msgstr ""

-#: main.c:323
+#: main.c:418
+msgid "Unattended mode"
+msgstr ""
+
+#: main.c:420
 msgid "<Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next screen"
 msgstr ""

-#: main.c:328
+#: main.c:426
 #, c-format
 msgid ""
 "Welcome to the %s installation program.\n"
@@ -49,53 +58,104 @@ msgid ""
 "Selecting Cancel on any of the following screens will reboot the computer."
 msgstr ""

-#: main.c:330
+#: main.c:428
 msgid "Start installation"
 msgstr ""

-#: main.c:339
-msgid "No local source media found. Starting download."
+#: main.c:449
+#, c-format
+msgid "The installer will now try downloading the installation image."
 msgstr ""

-#: main.c:340
-msgid "Downloading installation image ..."
+#: main.c:452
+#, c-format
+msgid ""
+"No source drive could be found.\n"
+"\n"
+"You can try downloading the required installation image."
 msgstr ""

-#: main.c:342
-msgid "Download error"
+#: main.c:456
+msgid ""
+"Please make sure to connect your machine to a network and the installer will"
+" try connect to acquire an IP address."
 msgstr ""

-#: main.c:376
+#: main.c:460
+msgid "Download installation image"
+msgstr ""
+
+#: main.c:473
+msgid "Trying to start networking (DHCP)..."
+msgstr ""
+
+#: main.c:484
+msgid ""
+"Networking could not be started but is required to go on with the installation.\n"
+"\n"
+"Please connect your machine to a network with a DHCP server and retry."
+msgstr ""
+
+#: main.c:487 main.c:516
+msgid "Retry"
+msgstr ""
+
+#: main.c:501
+msgid "Downloading installation image..."
+msgstr ""
+
+#: main.c:510
+#, c-format
+msgid "MD5 checksum mismatch"
+msgstr ""
+
+#: main.c:513
+#, c-format
+msgid ""
+"The installation image could not be downloaded.\n"
+"  Reason: %s\n"
+"\n"
+"%s"
+msgstr ""
+
+#: main.c:528
+#, c-format
+msgid ""
+"Could not mount %s to %s:\n"
+"  %s\n"
+msgstr ""
+
+#: main.c:543
 msgid "License Agreement"
 msgstr ""

-#: main.c:377
+#: main.c:544
 msgid "License not accepted!"
 msgstr ""

-#: main.c:399
+#: main.c:566
 msgid "No hard disk found."
 msgstr ""

-#: main.c:418
+#: main.c:587
 msgid "Disk Selection"
 msgstr ""

-#: main.c:419
+#: main.c:588
 msgid ""
 "Select the disk(s) you want to install IPFire on. First those will be partitioned, and then the partitions will have a filesystem put on them.\n"
 "\n"
 "ALL DATA ON THE DISK WILL BE DESTROYED."
 msgstr ""

-#: main.c:430
+#: main.c:599
 msgid ""
 "No disk has been selected.\n"
 "\n"
 "Please select one or more disks you want to install IPFire on."
 msgstr ""

-#: main.c:443
+#: main.c:617
 #, c-format
 msgid ""
 "The installation program will now prepare the chosen harddisk:\n"
@@ -105,15 +165,15 @@ msgid ""
 "Do you agree to continue?"
 msgstr ""

-#: main.c:445
+#: main.c:619
 msgid "Disk Setup"
 msgstr ""

-#: main.c:446 main.c:456
+#: main.c:620 main.c:630
 msgid "Delete all data"
 msgstr ""

-#: main.c:453
+#: main.c:627
 #, c-format
 msgid ""
 "The installation program will now set up a RAID configuration on the selected harddisks:\n"
@@ -124,104 +184,131 @@ msgid ""
 "Do you agree to continue?"
 msgstr ""

-#: main.c:455
+#: main.c:629
 msgid "RAID Setup"
 msgstr ""

-#: main.c:466
-msgid "You disk configuration is currently not supported."
+#: main.c:640
+msgid "Your disk configuration is currently not supported."
 msgstr ""

-#: main.c:480
+#: main.c:655
 msgid "Your harddisk is too small."
 msgstr ""

-#: main.c:494
+#: main.c:671
 msgid ""
 "Your harddisk is very small, but you can continue without a swap partition."
 msgstr ""

-#: main.c:506
+#: main.c:684
 msgid "ext4 Filesystem"
 msgstr ""

-#: main.c:507
+#: main.c:685
 msgid "ext4 Filesystem without journal"
 msgstr ""

-#: main.c:508
+#: main.c:686
 msgid "XFS Filesystem"
 msgstr ""

-#: main.c:509
+#: main.c:687
 msgid "ReiserFS Filesystem"
 msgstr ""

-#: main.c:523
+#: main.c:701
 msgid "Filesystem Selection"
 msgstr ""

-#: main.c:523
+#: main.c:701
 msgid "Please choose your filesystem:"
 msgstr ""

-#: main.c:534
+#: main.c:712
 msgid "Building RAID..."
 msgstr ""

-#: main.c:538
+#: main.c:716
 msgid "Unable to build the RAID."
 msgstr ""

-#: main.c:550
+#: main.c:728
 msgid "Partitioning disk..."
 msgstr ""

-#: main.c:554
+#: main.c:732
 msgid "Unable to partition the disk."
 msgstr ""

-#: main.c:561
+#: main.c:739
 msgid "Creating filesystems..."
 msgstr ""

-#: main.c:565
+#: main.c:743
 msgid "Unable to create filesystems."
 msgstr ""

-#: main.c:571
+#: main.c:749
 msgid "Unable to mount filesystems."
 msgstr ""

-#: main.c:582
+#: main.c:760
 msgid "Installing the system..."
 msgstr ""

-#: main.c:583
+#: main.c:761
 msgid "Unable to install the system."
 msgstr ""

-#: main.c:599
+#: main.c:777
 msgid "Installing the language cache..."
 msgstr ""

-#: main.c:600
+#: main.c:778
 msgid "Unable to install the language cache."
 msgstr ""

-#: main.c:605
+#: main.c:783
 msgid "Installing the bootloader..."
 msgstr ""

-#: main.c:612
+#: main.c:790
 msgid "Unable to open /etc/default/grub for writing."
 msgstr ""

-#: main.c:634
+#: main.c:812
 msgid "Unable to install the bootloader."
 msgstr ""

-#: main.c:666
+#: main.c:826
+msgid ""
+"A backup file has been found on the installation image.\n"
+"\n"
+"Do you want to restore the backup?"
+msgstr ""
+
+#: main.c:827
+msgid "Yes"
+msgstr ""
+
+#: main.c:827
+msgid "No"
+msgstr ""
+
+#: main.c:834
+msgid "An error occured when the backup file was restored."
+msgstr ""
+
+#: main.c:869
+msgid "Running post-install script..."
+msgstr ""
+
+#: main.c:870
+msgid "Post-install script failed."
+msgstr ""
+
+#: main.c:877
 #, c-format
 msgid ""
 "%s was successfully installed!\n"
@@ -229,14 +316,14 @@ msgid ""
 "Please remove any installation mediums from this system and hit the reboot button. Once the system has restarted you will be asked to setup networking and system passwords. After that, you should point your web browser at https://%s:444 (or what ever you name your %s) for the web configuration console."
 msgstr ""

-#: main.c:671
+#: main.c:882
 msgid "Congratulations!"
 msgstr ""

-#: main.c:671
+#: main.c:882
 msgid "Reboot"
 msgstr ""

-#: main.c:682
+#: main.c:893
 msgid "Setup has failed. Press Ok to reboot."
 msgstr ""
--- a/src/installer/po/id.po
+++ b/src/installer/po/id.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: IPFire Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-21 15:09+0000\n"
-"PO-Revision-Date: 2014-08-21 15:11+0000\n"
+"POT-Creation-Date: 2014-11-05 01:29+0000\n"
+"PO-Revision-Date: 2014-11-05 01:33+0000\n"
 "Last-Translator: Michael Tremer <michael.tremer@ipfire.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/ipfire/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -17,31 +17,40 @@ msgstr ""
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"

-#: main.c:77 main.c:148 main.c:313 main.c:339 main.c:493 main.c:524 main.c:682
+#: main.c:78 main.c:179 main.c:404 main.c:670 main.c:702 main.c:893
 msgid "OK"
 msgstr ""

-#: main.c:78 main.c:446 main.c:456 main.c:493 main.c:524
+#: main.c:79 main.c:460 main.c:487 main.c:516 main.c:620 main.c:630 main.c:670
+#: main.c:702
 msgid "Cancel"
 msgstr ""

-#: main.c:145
+#: main.c:176
 msgid "I accept this license"
 msgstr ""

-#: main.c:312
+#: main.c:384
+msgid "Warning: Unattended installation will start in 10 seconds..."
+msgstr ""
+
+#: main.c:403
 msgid "Language selection"
 msgstr ""

-#: main.c:312
+#: main.c:403
 msgid "Select the language you wish to use for the installation."
 msgstr ""

-#: main.c:323
+#: main.c:418
+msgid "Unattended mode"
+msgstr ""
+
+#: main.c:420
 msgid "<Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next screen"
 msgstr ""

-#: main.c:328
+#: main.c:426
 #, c-format
 msgid ""
 "Welcome to the %s installation program.\n"
@@ -49,53 +58,104 @@ msgid ""
 "Selecting Cancel on any of the following screens will reboot the computer."
 msgstr ""

-#: main.c:330
+#: main.c:428
 msgid "Start installation"
 msgstr ""

-#: main.c:339
-msgid "No local source media found. Starting download."
+#: main.c:449
+#, c-format
+msgid "The installer will now try downloading the installation image."
 msgstr ""

-#: main.c:340
-msgid "Downloading installation image ..."
+#: main.c:452
+#, c-format
+msgid ""
+"No source drive could be found.\n"
+"\n"
+"You can try downloading the required installation image."
 msgstr ""

-#: main.c:342
-msgid "Download error"
+#: main.c:456
+msgid ""
+"Please make sure to connect your machine to a network and the installer will"
+" try connect to acquire an IP address."
 msgstr ""

-#: main.c:376
+#: main.c:460
+msgid "Download installation image"
+msgstr ""
+
+#: main.c:473
+msgid "Trying to start networking (DHCP)..."
+msgstr ""
+
+#: main.c:484
+msgid ""
+"Networking could not be started but is required to go on with the installation.\n"
+"\n"
+"Please connect your machine to a network with a DHCP server and retry."
+msgstr ""
+
+#: main.c:487 main.c:516
+msgid "Retry"
+msgstr ""
+
+#: main.c:501
+msgid "Downloading installation image..."
+msgstr ""
+
+#: main.c:510
+#, c-format
+msgid "MD5 checksum mismatch"
+msgstr ""
+
+#: main.c:513
+#, c-format
+msgid ""
+"The installation image could not be downloaded.\n"
+"  Reason: %s\n"
+"\n"
+"%s"
+msgstr ""
+
+#: main.c:528
+#, c-format
+msgid ""
+"Could not mount %s to %s:\n"
+"  %s\n"
+msgstr ""
+
+#: main.c:543
 msgid "License Agreement"
 msgstr ""

-#: main.c:377
+#: main.c:544
 msgid "License not accepted!"
 msgstr ""

-#: main.c:399
+#: main.c:566
 msgid "No hard disk found."
 msgstr ""

-#: main.c:418
+#: main.c:587
 msgid "Disk Selection"
 msgstr ""

-#: main.c:419
+#: main.c:588
 msgid ""
 "Select the disk(s) you want to install IPFire on. First those will be partitioned, and then the partitions will have a filesystem put on them.\n"
 "\n"
 "ALL DATA ON THE DISK WILL BE DESTROYED."
 msgstr ""

-#: main.c:430
+#: main.c:599
 msgid ""
 "No disk has been selected.\n"
 "\n"
 "Please select one or more disks you want to install IPFire on."
 msgstr ""

-#: main.c:443
+#: main.c:617
 #, c-format
 msgid ""
 "The installation program will now prepare the chosen harddisk:\n"
@@ -105,15 +165,15 @@ msgid ""
 "Do you agree to continue?"
 msgstr ""

-#: main.c:445
+#: main.c:619
 msgid "Disk Setup"
 msgstr ""

-#: main.c:446 main.c:456
+#: main.c:620 main.c:630
 msgid "Delete all data"
 msgstr ""

-#: main.c:453
+#: main.c:627
 #, c-format
 msgid ""
 "The installation program will now set up a RAID configuration on the selected harddisks:\n"
@@ -124,104 +184,131 @@ msgid ""
 "Do you agree to continue?"
 msgstr ""

-#: main.c:455
+#: main.c:629
 msgid "RAID Setup"
 msgstr ""

-#: main.c:466
-msgid "You disk configuration is currently not supported."
+#: main.c:640
+msgid "Your disk configuration is currently not supported."
 msgstr ""

-#: main.c:480
+#: main.c:655
 msgid "Your harddisk is too small."
 msgstr ""

-#: main.c:494
+#: main.c:671
 msgid ""
 "Your harddisk is very small, but you can continue without a swap partition."
 msgstr ""

-#: main.c:506
+#: main.c:684
 msgid "ext4 Filesystem"
 msgstr ""

-#: main.c:507
+#: main.c:685
 msgid "ext4 Filesystem without journal"
 msgstr ""

-#: main.c:508
+#: main.c:686
 msgid "XFS Filesystem"
 msgstr ""

-#: main.c:509
+#: main.c:687
 msgid "ReiserFS Filesystem"
 msgstr ""

-#: main.c:523
+#: main.c:701
 msgid "Filesystem Selection"
 msgstr ""

-#: main.c:523
+#: main.c:701
 msgid "Please choose your filesystem:"
 msgstr ""

-#: main.c:534
+#: main.c:712
 msgid "Building RAID..."
 msgstr ""

-#: main.c:538
+#: main.c:716
 msgid "Unable to build the RAID."
 msgstr ""

-#: main.c:550
+#: main.c:728
 msgid "Partitioning disk..."
 msgstr ""

-#: main.c:554
+#: main.c:732
 msgid "Unable to partition the disk."
 msgstr ""

-#: main.c:561
+#: main.c:739
 msgid "Creating filesystems..."
 msgstr ""

-#: main.c:565
+#: main.c:743
 msgid "Unable to create filesystems."
 msgstr ""

-#: main.c:571
+#: main.c:749
 msgid "Unable to mount filesystems."
 msgstr ""

-#: main.c:582
+#: main.c:760
 msgid "Installing the system..."
 msgstr ""

-#: main.c:583
+#: main.c:761
 msgid "Unable to install the system."
 msgstr ""

-#: main.c:599
+#: main.c:777
 msgid "Installing the language cache..."
 msgstr ""

-#: main.c:600
+#: main.c:778
 msgid "Unable to install the language cache."
 msgstr ""

-#: main.c:605
+#: main.c:783
 msgid "Installing the bootloader..."
 msgstr ""

-#: main.c:612
+#: main.c:790
 msgid "Unable to open /etc/default/grub for writing."
 msgstr ""

-#: main.c:634
+#: main.c:812
 msgid "Unable to install the bootloader."
 msgstr ""

-#: main.c:666
+#: main.c:826
+msgid ""
+"A backup file has been found on the installation image.\n"
+"\n"
+"Do you want to restore the backup?"
+msgstr ""
+
+#: main.c:827
+msgid "Yes"
+msgstr ""
+
+#: main.c:827
+msgid "No"
+msgstr ""
+
+#: main.c:834
+msgid "An error occured when the backup file was restored."
+msgstr ""
+
+#: main.c:869
+msgid "Running post-install script..."
+msgstr ""
+
+#: main.c:870
+msgid "Post-install script failed."
+msgstr ""
+
+#: main.c:877
 #, c-format
 msgid ""
 "%s was successfully installed!\n"
@@ -229,14 +316,14 @@ msgid ""
 "Please remove any installation mediums from this system and hit the reboot button. Once the system has restarted you will be asked to setup networking and system passwords. After that, you should point your web browser at https://%s:444 (or what ever you name your %s) for the web configuration console."
 msgstr ""

-#: main.c:671
+#: main.c:882
 msgid "Congratulations!"
 msgstr ""

-#: main.c:671
+#: main.c:882
 msgid "Reboot"
 msgstr ""

-#: main.c:682
+#: main.c:893
 msgid "Setup has failed. Press Ok to reboot."
 msgstr ""
--- a/src/installer/po/it.po
+++ b/src/installer/po/it.po
@@ -3,13 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Gabriele, 2014
+# luX <lucianocataldo@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: IPFire Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-21 15:09+0000\n"
-"PO-Revision-Date: 2014-08-21 15:11+0000\n"
-"Last-Translator: Michael Tremer <michael.tremer@ipfire.org>\n"
+"POT-Creation-Date: 2014-11-05 01:29+0000\n"
+"PO-Revision-Date: 2014-12-06 18:41+0000\n"
+"Last-Translator: Gabriele\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/ipfire/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,85 +19,145 @@ msgstr ""
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"

-#: main.c:77 main.c:148 main.c:313 main.c:339 main.c:493 main.c:524 main.c:682
+#: main.c:78 main.c:179 main.c:404 main.c:670 main.c:702 main.c:893
 msgid "OK"
-msgstr ""
+msgstr "OK"

-#: main.c:78 main.c:446 main.c:456 main.c:493 main.c:524
+#: main.c:79 main.c:460 main.c:487 main.c:516 main.c:620 main.c:630 main.c:670
+#: main.c:702
 msgid "Cancel"
-msgstr ""
+msgstr "Annulla"

-#: main.c:145
+#: main.c:176
 msgid "I accept this license"
-msgstr ""
+msgstr "Accetto questa licenza"

-#: main.c:312
+#: main.c:384
+msgid "Warning: Unattended installation will start in 10 seconds..."
+msgstr "Attenzione: L'installazione automatica inizierà tra 10 secondi..."
+
+#: main.c:403
 msgid "Language selection"
-msgstr ""
+msgstr "Scelta della lingua"

-#: main.c:312
+#: main.c:403
 msgid "Select the language you wish to use for the installation."
-msgstr ""
+msgstr "Selezionare la lingua che si desidera utilizzare per l'installazione."

-#: main.c:323
+#: main.c:418
+msgid "Unattended mode"
+msgstr "Modalità automatico"
+
+#: main.c:420
 msgid "<Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next screen"
-msgstr ""
+msgstr "<Tab>/<Alt-Tab> tra elementi | <Space> seleziona | <F12> schermata successiva"

-#: main.c:328
+#: main.c:426
 #, c-format
 msgid ""
 "Welcome to the %s installation program.\n"
 "\n"
 "Selecting Cancel on any of the following screens will reboot the computer."
-msgstr ""
+msgstr "Benvenuti nel programma di installazione %s.\n\nSelezionando Annulla su una delle seguenti schermate si riavvia il computer."

-#: main.c:330
+#: main.c:428
 msgid "Start installation"
-msgstr ""
+msgstr "Avvio installazione"

-#: main.c:339
-msgid "No local source media found. Starting download."
-msgstr ""
+#: main.c:449
+#, c-format
+msgid "The installer will now try downloading the installation image."
+msgstr "Il programma di installazione proverà ora a scaricare l'immagine di installazione."

-#: main.c:340
-msgid "Downloading installation image ..."
-msgstr ""
+#: main.c:452
+#, c-format
+msgid ""
+"No source drive could be found.\n"
+"\n"
+"You can try downloading the required installation image."
+msgstr "Nessuna unità di origine trovata.\n\nPuoi provare a scaricare l'immagine d'installazione richiesta."

-#: main.c:342
-msgid "Download error"
-msgstr ""
+#: main.c:456
+msgid ""
+"Please make sure to connect your machine to a network and the installer will"
+" try connect to acquire an IP address."
+msgstr "Per piacere assicurati di collegare il tuo computer ad una rete e il programma d'installazione proverà ad acquisire un indirizzo IP."

-#: main.c:376
+#: main.c:460
+msgid "Download installation image"
+msgstr "Scaricamento immagine d'installazione"
+
+#: main.c:473
+msgid "Trying to start networking (DHCP)..."
+msgstr "Provo ad avviare la rete (DHCP)..."
+
+#: main.c:484
+msgid ""
+"Networking could not be started but is required to go on with the installation.\n"
+"\n"
+"Please connect your machine to a network with a DHCP server and retry."
+msgstr "Non è stato possibile avviare la rete, ma è richiesto per continuare l'installazione.\n\nPer piacere collega il tuo computer ad una rete con un server DHCP e riprova."
+
+#: main.c:487 main.c:516
+msgid "Retry"
+msgstr "Riprova"
+
+#: main.c:501
+msgid "Downloading installation image..."
+msgstr "Scaricamento immagine di installazione..."
+
+#: main.c:510
+#, c-format
+msgid "MD5 checksum mismatch"
+msgstr "Checksum MD5 non corrispondente"
+
+#: main.c:513
+#, c-format
+msgid ""
+"The installation image could not be downloaded.\n"
+"  Reason: %s\n"
+"\n"
+"%s"
+msgstr "Non è stato possibile scaricare l'immagine di installazione.\nMotivo: %s\n\n%s"
+
+#: main.c:528
+#, c-format
+msgid ""
+"Could not mount %s to %s:\n"
+"  %s\n"
+msgstr "Impossibile montare %s su %s:\n  %s\n"
+
+#: main.c:543
 msgid "License Agreement"
-msgstr ""
+msgstr "Contratto di licenza"

-#: main.c:377
+#: main.c:544
 msgid "License not accepted!"
-msgstr ""
+msgstr "Licenza non accettata!"

-#: main.c:399
+#: main.c:566
 msgid "No hard disk found."
-msgstr ""
+msgstr "Nessun Hard Disk trovato."

-#: main.c:418
+#: main.c:587
 msgid "Disk Selection"
-msgstr ""
+msgstr "Selezione disco"

-#: main.c:419
+#: main.c:588
 msgid ""
 "Select the disk(s) you want to install IPFire on. First those will be partitioned, and then the partitions will have a filesystem put on them.\n"
 "\n"
 "ALL DATA ON THE DISK WILL BE DESTROYED."
-msgstr ""
+msgstr "Selezionare il disco su cui si desidera installare IPFire. In primo luogo verrà partizionato, e quindi le partizioni avranno un filesystem.\n\nTUTTI I DATI SUL DISCO VERRANNO DISTRUTTI."

-#: main.c:430
+#: main.c:599
 msgid ""
 "No disk has been selected.\n"
 "\n"
 "Please select one or more disks you want to install IPFire on."
-msgstr ""
+msgstr "Non è stato selezionato alcun disco.\n\nSi prega di selezionare uno o più dischi su cui si desidera installare IPFire."

-#: main.c:443
+#: main.c:617
 #, c-format
 msgid ""
 "The installation program will now prepare the chosen harddisk:\n"
@@ -103,17 +165,17 @@ msgid ""
 "  %s\n"
 "\n"
 "Do you agree to continue?"
-msgstr ""
+msgstr "Il programma di installazione preparerà l'hard disk prescelto.\n\n%s\n\nSiete d'accordo di continuare?"

-#: main.c:445
+#: main.c:619
 msgid "Disk Setup"
-msgstr ""
+msgstr "Disco di Installazione"

-#: main.c:446 main.c:456
+#: main.c:620 main.c:630
 msgid "Delete all data"
-msgstr ""
+msgstr "Elimina tutti i dati"

-#: main.c:453
+#: main.c:627
 #, c-format
 msgid ""
 "The installation program will now set up a RAID configuration on the selected harddisks:\n"
@@ -122,121 +184,148 @@ msgid ""
 "  %s\n"
 "\n"
 "Do you agree to continue?"
-msgstr ""
+msgstr "Il programma di installazione configurerà il RAID sul hard disk selezionato:\n\n%s\n%s\n\nSiete d'accordo di continuare?"

-#: main.c:455
+#: main.c:629
 msgid "RAID Setup"
-msgstr ""
+msgstr "Installazione RAID"

-#: main.c:466
-msgid "You disk configuration is currently not supported."
-msgstr ""
+#: main.c:640
+msgid "Your disk configuration is currently not supported."
+msgstr "La tua configurazione disco non è attualmente supportata."

-#: main.c:480
+#: main.c:655
 msgid "Your harddisk is too small."
-msgstr ""
+msgstr "Il disco rigido è troppo piccolo."

-#: main.c:494
+#: main.c:671
 msgid ""
 "Your harddisk is very small, but you can continue without a swap partition."
-msgstr ""
+msgstr "Il disco rigido è molto piccolo, ma puoi continuare senza una partizione di swap."

-#: main.c:506
+#: main.c:684
 msgid "ext4 Filesystem"
-msgstr ""
+msgstr "Filesystem ext4"

-#: main.c:507
+#: main.c:685
 msgid "ext4 Filesystem without journal"
-msgstr ""
+msgstr "ext4 Filesystem senza journal"

-#: main.c:508
+#: main.c:686
 msgid "XFS Filesystem"
-msgstr ""
+msgstr "Filesystem XFS"

-#: main.c:509
+#: main.c:687
 msgid "ReiserFS Filesystem"
-msgstr ""
+msgstr "Filesystem ReiserFS"

-#: main.c:523
+#: main.c:701
 msgid "Filesystem Selection"
-msgstr ""
+msgstr "Selezione del filesystem"

-#: main.c:523
+#: main.c:701
 msgid "Please choose your filesystem:"
-msgstr ""
+msgstr "Scegliere il filesystem:"

-#: main.c:534
+#: main.c:712
 msgid "Building RAID..."
-msgstr ""
+msgstr "Costruzione RAID..."

-#: main.c:538
+#: main.c:716
 msgid "Unable to build the RAID."
-msgstr ""
+msgstr "Impossibile generare il RAID."

-#: main.c:550
+#: main.c:728
 msgid "Partitioning disk..."
-msgstr ""
+msgstr "Partizionamento del disco..."

-#: main.c:554
+#: main.c:732
 msgid "Unable to partition the disk."
-msgstr ""
+msgstr "Impossibile partizionare il disco."

-#: main.c:561
+#: main.c:739
 msgid "Creating filesystems..."
-msgstr ""
+msgstr "Creazione filesystem..."

-#: main.c:565
+#: main.c:743
 msgid "Unable to create filesystems."
-msgstr ""
+msgstr "Impossibile creare il filesystem."

-#: main.c:571
+#: main.c:749
 msgid "Unable to mount filesystems."
-msgstr ""
+msgstr "Impossibile montare il filesystem."

-#: main.c:582
+#: main.c:760
 msgid "Installing the system..."
-msgstr ""
+msgstr "Installazione del sistema..."

-#: main.c:583
+#: main.c:761
 msgid "Unable to install the system."
-msgstr ""
+msgstr "Impossibile installare il sistema."

-#: main.c:599
+#: main.c:777
 msgid "Installing the language cache..."
-msgstr ""
+msgstr "Installazione della cache della lingua..."

-#: main.c:600
+#: main.c:778
 msgid "Unable to install the language cache."
-msgstr ""
+msgstr "Impossibile installare la cache della lingua."

-#: main.c:605
+#: main.c:783
 msgid "Installing the bootloader..."
-msgstr ""
+msgstr "Installazione del bootloader..."

-#: main.c:612
+#: main.c:790
 msgid "Unable to open /etc/default/grub for writing."
-msgstr ""
+msgstr "Impossibile aprire /etc/default/grub per la scrittura."

-#: main.c:634
+#: main.c:812
 msgid "Unable to install the bootloader."
-msgstr ""
+msgstr "Impossibile installare il bootloader."

-#: main.c:666
+#: main.c:826
+msgid ""
+"A backup file has been found on the installation image.\n"
+"\n"
+"Do you want to restore the backup?"
+msgstr "Un file di backup è stato trovato sull'immagine di installazione.\n\nVuoi ripristinare il backup?"
+
+#: main.c:827
+msgid "Yes"
+msgstr "Sì"
+
+#: main.c:827
+msgid "No"
+msgstr "No"
+
+#: main.c:834
+msgid "An error occured when the backup file was restored."
+msgstr "Si è verificato un errore durante il ripristino del file di backup"
+
+#: main.c:869
+msgid "Running post-install script..."
+msgstr "Esecuzione degli script post-installazione..."
+
+#: main.c:870
+msgid "Post-install script failed."
+msgstr "Script post-installazione fallito."
+
+#: main.c:877
 #, c-format
 msgid ""
 "%s was successfully installed!\n"
 "\n"
 "Please remove any installation mediums from this system and hit the reboot button. Once the system has restarted you will be asked to setup networking and system passwords. After that, you should point your web browser at https://%s:444 (or what ever you name your %s) for the web configuration console."
-msgstr ""
+msgstr "%s è stato installato con successo!\n\nSi prega di rimuovere eventuali supporti di installazione da questo sistema e premere il pulsante di riavvio. Una volta che il sistema è stato riavviato verrà chiesto di impostare le password di rete e di sistema.\nDopo di che, si dovrebbe puntare il browser web su https://%s:444 (o qualunque altro nome %s) per la console di configurazione web.\n "

-#: main.c:671
+#: main.c:882
 msgid "Congratulations!"
-msgstr ""
+msgstr "Congratulazioni!"

-#: main.c:671
+#: main.c:882
 msgid "Reboot"
-msgstr ""
+msgstr "Riavvio"

-#: main.c:682
+#: main.c:893
 msgid "Setup has failed. Press Ok to reboot."
-msgstr ""
+msgstr "Installazione non riuscita. Premere Ok per riavviare."
--- a/src/installer/po/ja.po
+++ b/src/installer/po/ja.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: IPFire Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-21 15:09+0000\n"
-"PO-Revision-Date: 2014-08-21 15:11+0000\n"
+"POT-Creation-Date: 2014-11-05 01:29+0000\n"
+"PO-Revision-Date: 2014-11-05 01:33+0000\n"
 "Last-Translator: Michael Tremer <michael.tremer@ipfire.org>\n"
 "Language-Team: Japanese (http://www.transifex.com/projects/p/ipfire/language/ja/)\n"
 "MIME-Version: 1.0\n"
@@ -17,31 +17,40 @@ msgstr ""
 "Language: ja\n"
 "Plural-Forms: nplurals=1; plural=0;\n"

-#: main.c:77 main.c:148 main.c:313 main.c:339 main.c:493 main.c:524 main.c:682
+#: main.c:78 main.c:179 main.c:404 main.c:670 main.c:702 main.c:893
 msgid "OK"
 msgstr ""

-#: main.c:78 main.c:446 main.c:456 main.c:493 main.c:524
+#: main.c:79 main.c:460 main.c:487 main.c:516 main.c:620 main.c:630 main.c:670
+#: main.c:702
 msgid "Cancel"
 msgstr ""

-#: main.c:145
+#: main.c:176
 msgid "I accept this license"
 msgstr ""

-#: main.c:312
+#: main.c:384
+msgid "Warning: Unattended installation will start in 10 seconds..."
+msgstr ""
+
+#: main.c:403
 msgid "Language selection"
 msgstr ""

-#: main.c:312
+#: main.c:403
 msgid "Select the language you wish to use for the installation."
 msgstr ""

-#: main.c:323
+#: main.c:418
+msgid "Unattended mode"
+msgstr ""
+
+#: main.c:420
 msgid "<Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next screen"
 msgstr ""

-#: main.c:328
+#: main.c:426
 #, c-format
 msgid ""
 "Welcome to the %s installation program.\n"
@@ -49,53 +58,104 @@ msgid ""
 "Selecting Cancel on any of the following screens will reboot the computer."
 msgstr ""

-#: main.c:330
+#: main.c:428
 msgid "Start installation"
 msgstr ""

-#: main.c:339
-msgid "No local source media found. Starting download."
+#: main.c:449
+#, c-format
+msgid "The installer will now try downloading the installation image."
 msgstr ""

-#: main.c:340
-msgid "Downloading installation image ..."
+#: main.c:452
+#, c-format
+msgid ""
+"No source drive could be found.\n"
+"\n"
+"You can try downloading the required installation image."
 msgstr ""

-#: main.c:342
-msgid "Download error"
+#: main.c:456
+msgid ""
+"Please make sure to connect your machine to a network and the installer will"
+" try connect to acquire an IP address."
 msgstr ""

-#: main.c:376
+#: main.c:460
+msgid "Download installation image"
+msgstr ""
+
+#: main.c:473
+msgid "Trying to start networking (DHCP)..."
+msgstr ""
+
+#: main.c:484
+msgid ""
+"Networking could not be started but is required to go on with the installation.\n"
+"\n"
+"Please connect your machine to a network with a DHCP server and retry."
+msgstr ""
+
+#: main.c:487 main.c:516
+msgid "Retry"
+msgstr ""
+
+#: main.c:501
+msgid "Downloading installation image..."
+msgstr ""
+
+#: main.c:510
+#, c-format
+msgid "MD5 checksum mismatch"
+msgstr ""
+
+#: main.c:513
+#, c-format
+msgid ""
+"The installation image could not be downloaded.\n"
+"  Reason: %s\n"
+"\n"
+"%s"
+msgstr ""
+
+#: main.c:528
+#, c-format
+msgid ""
+"Could not mount %s to %s:\n"
+"  %s\n"
+msgstr ""
+
+#: main.c:543
 msgid "License Agreement"
 msgstr ""

-#: main.c:377
+#: main.c:544
 msgid "License not accepted!"
 msgstr ""

-#: main.c:399
+#: main.c:566
 msgid "No hard disk found."
 msgstr ""

-#: main.c:418
+#: main.c:587
 msgid "Disk Selection"
 msgstr ""

-#: main.c:419
+#: main.c:588
 msgid ""
 "Select the disk(s) you want to install IPFire on. First those will be partitioned, and then the partitions will have a filesystem put on them.\n"
 "\n"
 "ALL DATA ON THE DISK WILL BE DESTROYED."
 msgstr ""

-#: main.c:430
+#: main.c:599
 msgid ""
 "No disk has been selected.\n"
 "\n"
 "Please select one or more disks you want to install IPFire on."
 msgstr ""

-#: main.c:443
+#: main.c:617
 #, c-format
 msgid ""
 "The installation program will now prepare the chosen harddisk:\n"
@@ -105,15 +165,15 @@ msgid ""
 "Do you agree to continue?"
 msgstr ""

-#: main.c:445
+#: main.c:619
 msgid "Disk Setup"
 msgstr ""

-#: main.c:446 main.c:456
+#: main.c:620 main.c:630
 msgid "Delete all data"
 msgstr ""

-#: main.c:453
+#: main.c:627
 #, c-format
 msgid ""
 "The installation program will now set up a RAID configuration on the selected harddisks:\n"
@@ -124,104 +184,131 @@ msgid ""
 "Do you agree to continue?"
 msgstr ""

-#: main.c:455
+#: main.c:629
 msgid "RAID Setup"
 msgstr ""

-#: main.c:466
-msgid "You disk configuration is currently not supported."
+#: main.c:640
+msgid "Your disk configuration is currently not supported."
 msgstr ""

-#: main.c:480
+#: main.c:655
 msgid "Your harddisk is too small."
 msgstr ""

-#: main.c:494
+#: main.c:671
 msgid ""
 "Your harddisk is very small, but you can continue without a swap partition."
 msgstr ""

-#: main.c:506
+#: main.c:684
 msgid "ext4 Filesystem"
 msgstr ""

-#: main.c:507
+#: main.c:685
 msgid "ext4 Filesystem without journal"
 msgstr ""

-#: main.c:508
+#: main.c:686
 msgid "XFS Filesystem"
 msgstr ""

-#: main.c:509
+#: main.c:687
 msgid "ReiserFS Filesystem"
 msgstr ""

-#: main.c:523
+#: main.c:701
 msgid "Filesystem Selection"
 msgstr ""

-#: main.c:523
+#: main.c:701
 msgid "Please choose your filesystem:"
 msgstr ""

-#: main.c:534
+#: main.c:712
 msgid "Building RAID..."
 msgstr ""

-#: main.c:538
+#: main.c:716
 msgid "Unable to build the RAID."
 msgstr ""

-#: main.c:550
+#: main.c:728
 msgid "Partitioning disk..."
 msgstr ""

-#: main.c:554
+#: main.c:732
 msgid "Unable to partition the disk."
 msgstr ""

-#: main.c:561
+#: main.c:739
 msgid "Creating filesystems..."
 msgstr ""

-#: main.c:565
+#: main.c:743
 msgid "Unable to create filesystems."
 msgstr ""

-#: main.c:571
+#: main.c:749
 msgid "Unable to mount filesystems."
 msgstr ""

-#: main.c:582
+#: main.c:760
 msgid "Installing the system..."
 msgstr ""

-#: main.c:583
+#: main.c:761
 msgid "Unable to install the system."
 msgstr ""

-#: main.c:599
+#: main.c:777
 msgid "Installing the language cache..."
 msgstr ""

-#: main.c:600
+#: main.c:778
 msgid "Unable to install the language cache."
 msgstr ""

-#: main.c:605
+#: main.c:783
 msgid "Installing the bootloader..."
 msgstr ""

-#: main.c:612
+#: main.c:790
 msgid "Unable to open /etc/default/grub for writing."
 msgstr ""

-#: main.c:634
+#: main.c:812
 msgid "Unable to install the bootloader."
 msgstr ""

-#: main.c:666
+#: main.c:826
+msgid ""
+"A backup file has been found on the installation image.\n"
+"\n"
+"Do you want to restore the backup?"
+msgstr ""
+
+#: main.c:827
+msgid "Yes"
+msgstr ""
+
+#: main.c:827
+msgid "No"
+msgstr ""
+
+#: main.c:834
+msgid "An error occured when the backup file was restored."
+msgstr ""
+
+#: main.c:869
+msgid "Running post-install script..."
+msgstr ""
+
+#: main.c:870
+msgid "Post-install script failed."
+msgstr ""
+
+#: main.c:877
 #, c-format
 msgid ""
 "%s was successfully installed!\n"
@@ -229,14 +316,14 @@ msgid ""
 "Please remove any installation mediums from this system and hit the reboot button. Once the system has restarted you will be asked to setup networking and system passwords. After that, you should point your web browser at https://%s:444 (or what ever you name your %s) for the web configuration console."
 msgstr ""

-#: main.c:671
+#: main.c:882
 msgid "Congratulations!"
 msgstr ""

-#: main.c:671
+#: main.c:882
 msgid "Reboot"
 msgstr ""

-#: main.c:682
+#: main.c:893
 msgid "Setup has failed. Press Ok to reboot."
 msgstr ""
--- a/src/installer/po/ja_JP.po
+++ b/src/installer/po/ja_JP.po
@@ -0,0 +1,329 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR The IPFire Project (www.ipfire.org)
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: IPFire Project\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-05 01:29+0000\n"
+"PO-Revision-Date: 2014-07-31 09:39+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/ipfire/language/ja_JP/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ja_JP\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: main.c:78 main.c:179 main.c:404 main.c:670 main.c:702 main.c:893
+msgid "OK"
+msgstr ""
+
+#: main.c:79 main.c:460 main.c:487 main.c:516 main.c:620 main.c:630 main.c:670
+#: main.c:702
+msgid "Cancel"
+msgstr ""
+
+#: main.c:176
+msgid "I accept this license"
+msgstr ""
+
+#: main.c:384
+msgid "Warning: Unattended installation will start in 10 seconds..."
+msgstr ""
+
+#: main.c:403
+msgid "Language selection"
+msgstr ""
+
+#: main.c:403
+msgid "Select the language you wish to use for the installation."
+msgstr ""
+
+#: main.c:418
+msgid "Unattended mode"
+msgstr ""
+
+#: main.c:420
+msgid "<Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next screen"
+msgstr ""
+
+#: main.c:426
+#, c-format
+msgid ""
+"Welcome to the %s installation program.\n"
+"\n"
+"Selecting Cancel on any of the following screens will reboot the computer."
+msgstr ""
+
+#: main.c:428
+msgid "Start installation"
+msgstr ""
+
+#: main.c:449
+#, c-format
+msgid "The installer will now try downloading the installation image."
+msgstr ""
+
+#: main.c:452
+#, c-format
+msgid ""
+"No source drive could be found.\n"
+"\n"
+"You can try downloading the required installation image."
+msgstr ""
+
+#: main.c:456
+msgid ""
+"Please make sure to connect your machine to a network and the installer will"
+" try connect to acquire an IP address."
+msgstr ""
+
+#: main.c:460
+msgid "Download installation image"
+msgstr ""
+
+#: main.c:473
+msgid "Trying to start networking (DHCP)..."
+msgstr ""
+
+#: main.c:484
+msgid ""
+"Networking could not be started but is required to go on with the installation.\n"
+"\n"
+"Please connect your machine to a network with a DHCP server and retry."
+msgstr ""
+
+#: main.c:487 main.c:516
+msgid "Retry"
+msgstr ""
+
+#: main.c:501
+msgid "Downloading installation image..."
+msgstr ""
+
+#: main.c:510
+#, c-format
+msgid "MD5 checksum mismatch"
+msgstr ""
+
+#: main.c:513
+#, c-format
+msgid ""
+"The installation image could not be downloaded.\n"
+"  Reason: %s\n"
+"\n"
+"%s"
+msgstr ""
+
+#: main.c:528
+#, c-format
+msgid ""
+"Could not mount %s to %s:\n"
+"  %s\n"
+msgstr ""
+
+#: main.c:543
+msgid "License Agreement"
+msgstr ""
+
+#: main.c:544
+msgid "License not accepted!"
+msgstr ""
+
+#: main.c:566
+msgid "No hard disk found."
+msgstr ""
+
+#: main.c:587
+msgid "Disk Selection"
+msgstr ""
+
+#: main.c:588
+msgid ""
+"Select the disk(s) you want to install IPFire on. First those will be partitioned, and then the partitions will have a filesystem put on them.\n"
+"\n"
+"ALL DATA ON THE DISK WILL BE DESTROYED."
+msgstr ""
+
+#: main.c:599
+msgid ""
+"No disk has been selected.\n"
+"\n"
+"Please select one or more disks you want to install IPFire on."
+msgstr ""
+
+#: main.c:617
+#, c-format
+msgid ""
+"The installation program will now prepare the chosen harddisk:\n"
+"\n"
+"  %s\n"
+"\n"
+"Do you agree to continue?"
+msgstr ""
+
+#: main.c:619
+msgid "Disk Setup"
+msgstr ""
+
+#: main.c:620 main.c:630
+msgid "Delete all data"
+msgstr ""
+
+#: main.c:627
+#, c-format
+msgid ""
+"The installation program will now set up a RAID configuration on the selected harddisks:\n"
+"\n"
+"  %s\n"
+"  %s\n"
+"\n"
+"Do you agree to continue?"
+msgstr ""
+
+#: main.c:629
+msgid "RAID Setup"
+msgstr ""
+
+#: main.c:640
+msgid "Your disk configuration is currently not supported."
+msgstr ""
+
+#: main.c:655
+msgid "Your harddisk is too small."
+msgstr ""
+
+#: main.c:671
+msgid ""
+"Your harddisk is very small, but you can continue without a swap partition."
+msgstr ""
+
+#: main.c:684
+msgid "ext4 Filesystem"
+msgstr ""
+
+#: main.c:685
+msgid "ext4 Filesystem without journal"
+msgstr ""
+
+#: main.c:686
+msgid "XFS Filesystem"
+msgstr ""
+
+#: main.c:687
+msgid "ReiserFS Filesystem"
+msgstr ""
+
+#: main.c:701
+msgid "Filesystem Selection"
+msgstr ""
+
+#: main.c:701
+msgid "Please choose your filesystem:"
+msgstr ""
+
+#: main.c:712
+msgid "Building RAID..."
+msgstr ""
+
+#: main.c:716
+msgid "Unable to build the RAID."
+msgstr ""
+
+#: main.c:728
+msgid "Partitioning disk..."
+msgstr ""
+
+#: main.c:732
+msgid "Unable to partition the disk."
+msgstr ""
+
+#: main.c:739
+msgid "Creating filesystems..."
+msgstr ""
+
+#: main.c:743
+msgid "Unable to create filesystems."
+msgstr ""
+
+#: main.c:749
+msgid "Unable to mount filesystems."
+msgstr ""
+
+#: main.c:760
+msgid "Installing the system..."
+msgstr ""
+
+#: main.c:761
+msgid "Unable to install the system."
+msgstr ""
+
+#: main.c:777
+msgid "Installing the language cache..."
+msgstr ""
+
+#: main.c:778
+msgid "Unable to install the language cache."
+msgstr ""
+
+#: main.c:783
+msgid "Installing the bootloader..."
+msgstr ""
+
+#: main.c:790
+msgid "Unable to open /etc/default/grub for writing."
+msgstr ""
+
+#: main.c:812
+msgid "Unable to install the bootloader."
+msgstr ""
+
+#: main.c:826
+msgid ""
+"A backup file has been found on the installation image.\n"
+"\n"
+"Do you want to restore the backup?"
+msgstr ""
+
+#: main.c:827
+msgid "Yes"
+msgstr ""
+
+#: main.c:827
+msgid "No"
+msgstr ""
+
+#: main.c:834
+msgid "An error occured when the backup file was restored."
+msgstr ""
+
+#: main.c:869
+msgid "Running post-install script..."
+msgstr ""
+
+#: main.c:870
+msgid "Post-install script failed."
+msgstr ""
+
+#: main.c:877
+#, c-format
+msgid ""
+"%s was successfully installed!\n"
+"\n"
+"Please remove any installation mediums from this system and hit the reboot button. Once the system has restarted you will be asked to setup networking and system passwords. After that, you should point your web browser at https://%s:444 (or what ever you name your %s) for the web configuration console."
+msgstr ""
+
+#: main.c:882
+msgid "Congratulations!"
+msgstr ""
+
+#: main.c:882
+msgid "Reboot"
+msgstr ""
+
+#: main.c:893
+msgid "Setup has failed. Press Ok to reboot."
+msgstr ""
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`mkimage -A arm -T script -C none -d boot.script boot.scr`