diff --git a/config/kernel/kernel.config.aarch64-ipfire b/config/kernel/kernel.config.aarch64-ipfire
index 7444864f3..c3b97ea92 100644
--- a/config/kernel/kernel.config.aarch64-ipfire
+++ b/config/kernel/kernel.config.aarch64-ipfire
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 4.14.48-ipfire-multi Kernel Configuration
+# Linux/arm64 4.14.50-ipfire-multi Kernel Configuration
 #
 CONFIG_ARM64=y
 CONFIG_64BIT=y
@@ -349,6 +349,7 @@ CONFIG_EFI_PARTITION=y
 # CONFIG_CMDLINE_PARTITION is not set
 CONFIG_BLOCK_COMPAT=y
 CONFIG_BLK_MQ_PCI=y
+CONFIG_BLK_MQ_VIRTIO=y
 
 #
 # IO Schedulers
@@ -538,6 +539,8 @@ CONFIG_NO_BOOTMEM=y
 CONFIG_MEMORY_ISOLATION=y
 # CONFIG_HAVE_BOOTMEM_INFO_NODE is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_MEMORY_BALLOON=y
+CONFIG_BALLOON_COMPACTION=y
 CONFIG_COMPACTION=y
 CONFIG_MIGRATION=y
 CONFIG_PHYS_ADDR_T_64BIT=y
@@ -1289,6 +1292,8 @@ CONFIG_OPENVSWITCH_GRE=m
 CONFIG_OPENVSWITCH_VXLAN=m
 CONFIG_OPENVSWITCH_GENEVE=m
 CONFIG_VSOCKETS=m
+CONFIG_VIRTIO_VSOCKETS=m
+CONFIG_VIRTIO_VSOCKETS_COMMON=m
 CONFIG_NETLINK_DIAG=m
 CONFIG_MPLS=y
 CONFIG_NET_MPLS_GSO=m
@@ -1612,6 +1617,8 @@ CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=16384
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
+CONFIG_VIRTIO_BLK=m
+CONFIG_VIRTIO_BLK_SCSI=y
 # CONFIG_BLK_DEV_RBD is not set
 # CONFIG_BLK_DEV_RSXX is not set
 CONFIG_NVME_CORE=m
@@ -1792,6 +1799,7 @@ CONFIG_ISCSI_BOOT_SYSFS=m
 # CONFIG_SCSI_PMCRAID is not set
 # CONFIG_SCSI_PM8001 is not set
 # CONFIG_SCSI_BFA_FC is not set
+CONFIG_SCSI_VIRTIO=y
 # CONFIG_SCSI_CHELSIO_FCOE is not set
 # CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
 CONFIG_SCSI_DH=y
@@ -1986,6 +1994,7 @@ CONFIG_TUN=m
 CONFIG_TAP=m
 # CONFIG_TUN_VNET_CROSS_LE is not set
 CONFIG_VETH=m
+CONFIG_VIRTIO_NET=m
 CONFIG_NLMON=m
 CONFIG_NET_VRF=m
 CONFIG_SUNGEM_PHY=m
@@ -2859,7 +2868,9 @@ CONFIG_SERIAL_MVEBU_CONSOLE=y
 CONFIG_PRINTER=m
 CONFIG_LP_CONSOLE=y
 CONFIG_PPDEV=m
+CONFIG_HVC_DRIVER=y
 # CONFIG_HVC_DCC is not set
+CONFIG_VIRTIO_CONSOLE=m
 CONFIG_IPMI_HANDLER=m
 # CONFIG_IPMI_PANIC_EVENT is not set
 CONFIG_IPMI_DEVICE_INTERFACE=m
@@ -2871,6 +2882,7 @@ CONFIG_HW_RANDOM=y
 CONFIG_HW_RANDOM_TIMERIOMEM=m
 CONFIG_HW_RANDOM_BCM2835=y
 CONFIG_HW_RANDOM_OMAP=y
+CONFIG_HW_RANDOM_VIRTIO=y
 CONFIG_HW_RANDOM_MESON=y
 CONFIG_HW_RANDOM_CAVIUM=y
 CONFIG_R3964=m
@@ -4242,6 +4254,7 @@ CONFIG_DRM_SUN8I_DW_HDMI=m
 CONFIG_DRM_SUN8I_MIXER=m
 # CONFIG_DRM_QXL is not set
 # CONFIG_DRM_BOCHS is not set
+CONFIG_DRM_VIRTIO_GPU=m
 CONFIG_DRM_PANEL=y
 
 #
@@ -4354,7 +4367,7 @@ CONFIG_FB_OPENCORES=m
 CONFIG_FB_SMSCUFX=m
 # CONFIG_FB_UDL is not set
 # CONFIG_FB_IBM_GXT4500 is not set
-# CONFIG_FB_VIRTUAL is not set
+CONFIG_FB_VIRTUAL=m
 # CONFIG_FB_METRONOME is not set
 # CONFIG_FB_MB862XX is not set
 # CONFIG_FB_BROADSHEET is not set
@@ -5395,12 +5408,17 @@ CONFIG_UIO=m
 # CONFIG_UIO_MF624 is not set
 # CONFIG_VFIO is not set
 CONFIG_VIRT_DRIVERS=y
+CONFIG_VIRTIO=y
 
 #
 # Virtio drivers
 #
-# CONFIG_VIRTIO_PCI is not set
-# CONFIG_VIRTIO_MMIO is not set
+CONFIG_VIRTIO_PCI=y
+CONFIG_VIRTIO_PCI_LEGACY=y
+CONFIG_VIRTIO_BALLOON=y
+CONFIG_VIRTIO_INPUT=y
+CONFIG_VIRTIO_MMIO=y
+CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
 
 #
 # Microsoft Hyper-V guest support
@@ -6597,6 +6615,7 @@ CONFIG_CRYPTO_CRYPTD=y
 # CONFIG_CRYPTO_MCRYPTD is not set
 CONFIG_CRYPTO_AUTHENC=m
 CONFIG_CRYPTO_TEST=m
+CONFIG_CRYPTO_ENGINE=m
 
 #
 # Authenticated Encryption with Associated Data
@@ -6705,6 +6724,7 @@ CONFIG_CRYPTO_HW=y
 # CONFIG_CRYPTO_DEV_CAVIUM_ZIP is not set
 CONFIG_CRYPTO_DEV_ROCKCHIP=y
 # CONFIG_CRYPTO_DEV_CHELSIO is not set
+CONFIG_CRYPTO_DEV_VIRTIO=m
 # CONFIG_CRYPTO_DEV_SAFEXCEL is not set
 # CONFIG_ASYMMETRIC_KEY_TYPE is not set
 
diff --git a/config/rootfiles/common/aarch64/linux b/config/rootfiles/common/aarch64/linux
index 28a02a322..34ef44080 100644
--- a/config/rootfiles/common/aarch64/linux
+++ b/config/rootfiles/common/aarch64/linux
@@ -48,8 +48,8 @@ boot/dtb-KVER-ipfire
 #boot/dtb-KVER-ipfire/arm/rtsm_ve-aemv8a.dtb
 #boot/dtb-KVER-ipfire/arm/vexpress-v2f-1xv7-ca53x2.dtb
 #boot/dtb-KVER-ipfire/broadcom
-#boot/dtb-KVER-ipfire/broadcom/bcm2837-rpi-3-b.dtb
 #boot/dtb-KVER-ipfire/broadcom/bcm2837-rpi-3-b-plus.dtb
+#boot/dtb-KVER-ipfire/broadcom/bcm2837-rpi-3-b.dtb
 #boot/dtb-KVER-ipfire/marvell
 #boot/dtb-KVER-ipfire/marvell/armada-3720-db.dtb
 #boot/dtb-KVER-ipfire/marvell/armada-3720-espressobin.dtb
@@ -100,6 +100,7 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/kernel/crypto/cast_common.ko
 #lib/modules/KVER-ipfire/kernel/crypto/ccm.ko
 #lib/modules/KVER-ipfire/kernel/crypto/cmac.ko
+#lib/modules/KVER-ipfire/kernel/crypto/crypto_engine.ko
 #lib/modules/KVER-ipfire/kernel/crypto/cts.ko
 #lib/modules/KVER-ipfire/kernel/crypto/deflate.ko
 #lib/modules/KVER-ipfire/kernel/crypto/ecdh_generic.ko
@@ -160,6 +161,7 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/kernel/drivers/bcma/bcma.ko
 #lib/modules/KVER-ipfire/kernel/drivers/block
 #lib/modules/KVER-ipfire/kernel/drivers/block/cryptoloop.ko
+#lib/modules/KVER-ipfire/kernel/drivers/block/virtio_blk.ko
 #lib/modules/KVER-ipfire/kernel/drivers/bluetooth
 #lib/modules/KVER-ipfire/kernel/drivers/bluetooth/ath3k.ko
 #lib/modules/KVER-ipfire/kernel/drivers/bluetooth/bcm203x.ko
@@ -188,6 +190,7 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/kernel/drivers/char/ipmi/ipmi_watchdog.ko
 #lib/modules/KVER-ipfire/kernel/drivers/char/lp.ko
 #lib/modules/KVER-ipfire/kernel/drivers/char/ppdev.ko
+#lib/modules/KVER-ipfire/kernel/drivers/char/virtio_console.ko
 #lib/modules/KVER-ipfire/kernel/drivers/clk
 #lib/modules/KVER-ipfire/kernel/drivers/clk/clk-si5351.ko
 #lib/modules/KVER-ipfire/kernel/drivers/clk/clk-si570.ko
@@ -195,6 +198,9 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/kernel/drivers/cpufreq
 #lib/modules/KVER-ipfire/kernel/drivers/cpufreq/arm_big_little.ko
 #lib/modules/KVER-ipfire/kernel/drivers/cpufreq/arm_big_little_dt.ko
+#lib/modules/KVER-ipfire/kernel/drivers/crypto
+#lib/modules/KVER-ipfire/kernel/drivers/crypto/virtio
+#lib/modules/KVER-ipfire/kernel/drivers/crypto/virtio/virtio_crypto.ko
 #lib/modules/KVER-ipfire/kernel/drivers/dma
 #lib/modules/KVER-ipfire/kernel/drivers/dma/dw
 #lib/modules/KVER-ipfire/kernel/drivers/dma/dw/dw_dmac_core.ko
@@ -272,6 +278,8 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/kernel/drivers/gpu/drm/udl/udl.ko
 #lib/modules/KVER-ipfire/kernel/drivers/gpu/drm/vc4
 #lib/modules/KVER-ipfire/kernel/drivers/gpu/drm/vc4/vc4.ko
+#lib/modules/KVER-ipfire/kernel/drivers/gpu/drm/virtio
+#lib/modules/KVER-ipfire/kernel/drivers/gpu/drm/virtio/virtio-gpu.ko
 #lib/modules/KVER-ipfire/kernel/drivers/hid
 #lib/modules/KVER-ipfire/kernel/drivers/hid/hid-aureal.ko
 #lib/modules/KVER-ipfire/kernel/drivers/hid/hid-gyration.ko
@@ -525,7 +533,7 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/kernel/drivers/md/dm-cache.ko
 #lib/modules/KVER-ipfire/kernel/drivers/md/dm-crypt.ko
 #lib/modules/KVER-ipfire/kernel/drivers/md/dm-log-userspace.ko
-#lib/modules/KVER-ipfire/kernel/drivers/md/dmpath.ko
+#lib/modules/KVER-ipfire/kernel/drivers/md/dm-multipath.ko
 #lib/modules/KVER-ipfire/kernel/drivers/md/dm-queue-length.ko
 #lib/modules/KVER-ipfire/kernel/drivers/md/dm-raid.ko
 #lib/modules/KVER-ipfire/kernel/drivers/md/dm-round-robin.ko
@@ -1483,6 +1491,7 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/kernel/drivers/net/usb/usbnet.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/usb/zaurus.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/veth.ko
+#lib/modules/KVER-ipfire/kernel/drivers/net/virtio_net.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/vmxnet3
 #lib/modules/KVER-ipfire/kernel/drivers/net/vmxnet3/vmxnet3.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/vrf.ko
@@ -1899,6 +1908,7 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/kernel/drivers/video/fbdev/ocfb.ko
 #lib/modules/KVER-ipfire/kernel/drivers/video/fbdev/smscufx.ko
 #lib/modules/KVER-ipfire/kernel/drivers/video/fbdev/ssd1307fb.ko
+#lib/modules/KVER-ipfire/kernel/drivers/video/fbdev/vfb.ko
 #lib/modules/KVER-ipfire/kernel/drivers/w1
 #lib/modules/KVER-ipfire/kernel/drivers/w1/masters
 #lib/modules/KVER-ipfire/kernel/drivers/w1/masters/ds1wm.ko
@@ -2493,6 +2503,8 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/kernel/net/unix
 #lib/modules/KVER-ipfire/kernel/net/unix/unix_diag.ko
 #lib/modules/KVER-ipfire/kernel/net/vmw_vsock
+#lib/modules/KVER-ipfire/kernel/net/vmw_vsock/vmw_vsock_virtio_transport.ko
+#lib/modules/KVER-ipfire/kernel/net/vmw_vsock/vmw_vsock_virtio_transport_common.ko
 #lib/modules/KVER-ipfire/kernel/net/vmw_vsock/vsock.ko
 #lib/modules/KVER-ipfire/kernel/net/wireless
 #lib/modules/KVER-ipfire/kernel/net/wireless/cfg80211.ko
diff --git a/config/rootfiles/common/aarch64/linux-headers b/config/rootfiles/common/aarch64/linux-headers
index db9f3d5dd..6cbe4b964 100644
--- a/config/rootfiles/common/aarch64/linux-headers
+++ b/config/rootfiles/common/aarch64/linux-headers
@@ -91,6 +91,7 @@
 #usr/include/drm/radeon_drm.h
 #usr/include/drm/savage_drm.h
 #usr/include/drm/sis_drm.h
+#usr/include/drm/sun4i_drm.h
 #usr/include/drm/tegra_drm.h
 #usr/include/drm/vc4_drm.h
 #usr/include/drm/vgem_drm.h
diff --git a/config/u-boot/boot.cmd b/config/u-boot/boot.cmd
index 6679d679a..1d3017ba9 100644
--- a/config/u-boot/boot.cmd
+++ b/config/u-boot/boot.cmd
@@ -8,9 +8,13 @@ if test ${boot_part} = ""; then
 fi;
 
 if test ${soc} = "kirkwood"; then
-	setenv kernel_type kirkwood;
+	setenv kernel_type -kirkwood;
 else
-	setenv kernel_type multi;
+	if test ${cpu} = "armv8"; then
+		echo ;
+	else
+		setenv kernel_type -multi;
+	fi;
 fi;
 
 # Import uEnv txt...
@@ -34,13 +38,25 @@ fi;
 if test "${SERIAL-CONSOLE}" = "ON"; then
 	if test ${console} = ""; then
 		if test "${board}" = "rpi"; then
-			if test "${fdtfile}" = "bcm2837-rpi-3-b-plus.dtb"; then
-				setenv console ttyS1,115200n8;
-			else
-				if test "${fdtfile}" = "bcm2837-rpi-3-b.dtb"; then
+			if test ${cpu} = "armv8"; then
+				if test "${fdtfile}" = "boradcom/bcm2837-rpi-3-b-plus.dtb"; then
 					setenv console ttyS1,115200n8;
 				else
-					setenv console ttyAMA0,115200n8;
+					if test "${fdtfile}" = "broadcom/bcm2837-rpi-3-b.dtb"; then
+						setenv console ttyS1,115200n8;
+					else
+						setenv console ttyAMA0,115200n8;
+					fi;
+				fi;
+			else
+				if test "${fdtfile}" = "bcm2837-rpi-3-b-plus.dtb"; then
+					setenv console ttyS1,115200n8;
+				else
+					if test "${fdtfile}" = "bcm2837-rpi-3-b.dtb"; then
+						setenv console ttyS1,115200n8;
+					else
+						setenv console ttyAMA0,115200n8;
+					fi;
 				fi;
 			fi;
 		else
@@ -55,10 +71,10 @@ else
 fi;
 
 setenv fdt_high ffffffff;
-fatload ${boot_dev} ${boot_part} ${kernel_addr_r} vmlinuz-${KVER}-ipfire-${kernel_type};
-fatload ${boot_dev} ${boot_part} ${fdt_addr_r} dtb-${KVER}-ipfire-${kernel_type}/${fdtfile};
+fatload ${boot_dev} ${boot_part} ${kernel_addr_r} vmlinuz-${KVER}-ipfire${kernel_type};
+fatload ${boot_dev} ${boot_part} ${fdt_addr_r} dtb-${KVER}-ipfire${kernel_type}/${fdtfile};
 setenv ramdisk_addr ${ramdisk_addr_r}
-if fatload ${boot_dev} ${boot_part} ${ramdisk_addr} uInit-${KVER}-ipfire-${kernel_type}; then
+if fatload ${boot_dev} ${boot_part} ${ramdisk_addr} uInit-${KVER}-ipfire${kernel_type}; then
 	echo Ramdisk loaded...;
 else
 	echo Ramdisk not loaded...;
diff --git a/config/u-boot/boot.scr b/config/u-boot/boot.scr
index 188d54456..0d9e67b96 100644
Binary files a/config/u-boot/boot.scr and b/config/u-boot/boot.scr differ
diff --git a/lfs/asterisk b/lfs/asterisk
index 723639015..8bedb4f28 100755
--- a/lfs/asterisk
+++ b/lfs/asterisk
@@ -28,7 +28,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = asterisk
-PAK_VER    = 24
+PAK_VER    = 25
 
 DEPS       = "jansson libsrtp opus"
 
@@ -99,6 +99,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 		--enable res_srtp \
 		--enable EXTRA-SOUNDS-EN-GSM \
 		--enable MOH-OPSOUND-GSM  \
+		--disable BUILD_NATIVE \
 		menuselect.makeopts
 
 	# add additional sounds
diff --git a/lfs/fireinfo b/lfs/fireinfo
index dec588705..784685029 100644
--- a/lfs/fireinfo
+++ b/lfs/fireinfo
@@ -71,6 +71,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/fireinfo-Don-t-crash-when-proc-cpuinfo-doesn-t-have-any-infor.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/fireinfo-Ignore-any-systems-with-ID-Default-string.patch
+
 	cd $(DIR_APP) && [ -x "configure" ] || sh ./autogen.sh
 	cd $(DIR_APP) && ./configure --prefix=/usr
 	cd $(DIR_APP) && make $(MAKETUNING)
diff --git a/lfs/linux b/lfs/linux
index f4700859c..c5d8a8e88 100644
--- a/lfs/linux
+++ b/lfs/linux
@@ -156,6 +156,10 @@ endif
 ifeq "$(KCFG)" "-multi"
 	# Apply Arm-multiarch kernel patches.
 	cd $(DIR_APP) && xzcat $(DIR_DL)/arm-multi-patches-$(ARM_PATCHES).patch.xz | patch -Np1
+endif
+ifeq "$(BUILD_ARCH)" "aarch64"
+	# Apply Arm-multiarch kernel patches.
+	cd $(DIR_APP) && xzcat $(DIR_DL)/arm-multi-patches-$(ARM_PATCHES).patch.xz | patch -Np1
 endif
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-3.14.79-amba-fix.patch
 
diff --git a/src/initscripts/helper/aws-setup b/src/initscripts/helper/aws-setup
index d8c7a358c..e16678339 100644
--- a/src/initscripts/helper/aws-setup
+++ b/src/initscripts/helper/aws-setup
@@ -6,7 +6,7 @@
 get() {
 	local file="${1}"
 
-	wget -qO - "http://169.254.169.254/latest/meta-data/${file}"
+	wget -qO - "http://169.254.169.254/latest/${file}"
 }
 
 to_address() {
@@ -64,7 +64,7 @@ find_interface() {
 }
 
 import_aws_configuration() {
-	local instance_id="$(get instance-id)"
+	local instance_id="$(get meta-data/instance-id)"
 
 	boot_mesg "Importing AWS configuration for instance ${instance_id}..."
 
@@ -72,7 +72,7 @@ import_aws_configuration() {
 	echo "${instance_id}" > /var/run/aws-instance-id
 
 	# Initialise system settings
-	local hostname=$(get local-hostname)
+	local hostname=$(get meta-data/local-hostname)
 
 	# Set hostname
 	if ! grep -q "^HOSTNAME=" /var/ipfire/main/settings; then
@@ -94,10 +94,10 @@ import_aws_configuration() {
 
 	# Import SSH keys for setup user
 	local line
-	for line in $(get "public-keys/"); do
+	for line in $(get "meta-data/public-keys/"); do
 		local key_no="${line%=*}"
 
-		local key="$(get public-keys/${key_no}/openssh-key)"
+		local key="$(get meta-data/public-keys/${key_no}/openssh-key)"
 		if [ -n "${key}" ] && ! grep -q "^${key}$" "/home/setup/.ssh/authorized_keys" 2>/dev/null; then
 			mkdir -p "/home/setup/.ssh"
 			chmod 700 "/home/setup/.ssh"
@@ -109,6 +109,9 @@ import_aws_configuration() {
 		fi
 	done
 
+	# Download user-data
+	local user_data="$(get user-data)"
+
 	# Import any DNS server settings
 	eval $(/usr/local/bin/readhash <(grep -E "^DNS([0-9])=" /var/ipfire/ethernet/settings 2>/dev/null))
 
@@ -119,24 +122,24 @@ import_aws_configuration() {
 	: > /var/ipfire/ethernet/settings
 
 	local mac
-	for mac in $(get network/interfaces/macs/); do
+	for mac in $(get meta-data/network/interfaces/macs/); do
 		# Remove trailing slash
 		mac="${mac//\//}"
 
-		local device_number="$(get "network/interfaces/macs/${mac}/device-number")"
-		local interface_id="$(get "network/interfaces/macs/${mac}/interface-id")"
+		local device_number="$(get "meta-data/network/interfaces/macs/${mac}/device-number")"
+		local interface_id="$(get "meta-data/network/interfaces/macs/${mac}/interface-id")"
 
 		# First IPv4 address
-		local ipv4_address="$(get "network/interfaces/macs/${mac}/local-ipv4s" | head -n1)"
+		local ipv4_address="$(get "meta-data/network/interfaces/macs/${mac}/local-ipv4s" | head -n1)"
 		local ipv4_address_num="$(to_integer "${ipv4_address}")"
 
 		# Get VPC subnet
-		local vpc="$(get "network/interfaces/macs/${mac}/vpc-ipv4-cidr-block")"
+		local vpc="$(get "meta-data/network/interfaces/macs/${mac}/vpc-ipv4-cidr-block")"
 		local vpc_netaddress="${vpc%/*}"
 		local vpc_netaddress_num="$(to_integer "${vpc_netaddress}")"
 
 		# Get subnet size
-		local subnet="$(get "network/interfaces/macs/${mac}/subnet-ipv4-cidr-block")"
+		local subnet="$(get "meta-data/network/interfaces/macs/${mac}/subnet-ipv4-cidr-block")"
 
 		local prefix="${subnet#*/}"
 		local netmask="$(prefix2netmask "${prefix}")"
@@ -174,7 +177,7 @@ import_aws_configuration() {
 				) >> /var/ipfire/ethernet/settings
 
 				# Import aliases for RED
-				for alias in $(get "network/interfaces/macs/${mac}/local-ipv4s" | tail -n +2); do
+				for alias in $(get "meta-data/network/interfaces/macs/${mac}/local-ipv4s" | tail -n +2); do
 					echo "${alias},on,"
 				done > /var/ipfire/ethernet/aliases
 				;;
@@ -246,6 +249,12 @@ import_aws_configuration() {
 
 		# This script has now completed the first steps of setup
 		touch /var/ipfire/main/firstsetup_ok
+
+		# Save user-data script to be executed later
+		if [ "${user_data:0:2}" = "#!" ]; then
+			echo "${user_data}" > /tmp/aws-user-data.script
+			chmod 700 /tmp/aws-user-data.script
+		fi
 	fi
 
 	# All done
diff --git a/src/initscripts/system/aws b/src/initscripts/system/aws
index f2a5c7cb7..896b3b17a 100644
--- a/src/initscripts/system/aws
+++ b/src/initscripts/system/aws
@@ -59,6 +59,16 @@ case "${1}" in
 
 		# End DHCP client immediately
 		dhclient -sf /etc/rc.d/helper/aws-setup -r "${intf}" &>/dev/null
+
+		# Run AWS user-data script
+		if [ -x "/tmp/aws-user-data.script" ]; then
+			/tmp/aws-user-data.script
+
+			# Delete the script right away
+			rm /tmp/aws-user-data.script
+		fi
+
+		exit 0
 		;;
 
 	status)
diff --git a/src/patches/fireinfo-Don-t-crash-when-proc-cpuinfo-doesn-t-have-any-infor.patch b/src/patches/fireinfo-Don-t-crash-when-proc-cpuinfo-doesn-t-have-any-infor.patch
new file mode 100644
index 000000000..a99c618e9
--- /dev/null
+++ b/src/patches/fireinfo-Don-t-crash-when-proc-cpuinfo-doesn-t-have-any-infor.patch
@@ -0,0 +1,34 @@
+From e2b6025dea547bf8de4bd2b8056f2a8227c635f5 Mon Sep 17 00:00:00 2001
+From: Michael Tremer <michael.tremer@ipfire.org>
+Date: Wed, 13 Jun 2018 20:56:41 +0200
+Subject: [PATCH 1/2] Don't crash when /proc/cpuinfo doesn't have any
+ information
+
+Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
+---
+ src/fireinfo/cpu.py | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/src/fireinfo/cpu.py b/src/fireinfo/cpu.py
+index 541575a..dc76caf 100644
+--- a/src/fireinfo/cpu.py
++++ b/src/fireinfo/cpu.py
+@@ -108,10 +108,11 @@ class CPU(object):
+ 		"""
+ 			Return the model string of this CPU.
+ 		"""
+-		try:
+-			return self.__cpuinfo["model_name"]
+-		except KeyError:
+-			return self.__cpuinfo["Processor"]
++		for key in ("model_name", "Processor"):
++			try:
++				return self.__cpuinfo[key]
++			except KeyError:
++				pass
+ 
+ 	@property
+ 	def vendor(self):
+-- 
+2.12.2
+
diff --git a/src/patches/fireinfo-Ignore-any-systems-with-ID-Default-string.patch b/src/patches/fireinfo-Ignore-any-systems-with-ID-Default-string.patch
new file mode 100644
index 000000000..ace5d0133
--- /dev/null
+++ b/src/patches/fireinfo-Ignore-any-systems-with-ID-Default-string.patch
@@ -0,0 +1,25 @@
+From d1f6789178e141664895332af79dbe7aa9e5ab68 Mon Sep 17 00:00:00 2001
+From: Michael Tremer <michael.tremer@ipfire.org>
+Date: Wed, 13 Jun 2018 20:58:42 +0200
+Subject: [PATCH 2/2] Ignore any systems with ID "Default string"
+
+Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
+---
+ src/fireinfo/system.py | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/fireinfo/system.py b/src/fireinfo/system.py
+index e3295af..73c3882 100644
+--- a/src/fireinfo/system.py
++++ b/src/fireinfo/system.py
+@@ -42,6 +42,7 @@ INVALID_ID_STRINGS = (
+ 	"N/A", "n/a",
+ 	"12345", "54321", "202020",
+ 	"Chassis", "chassis",
++	"Default string",
+ 	"EVAL",
+ 	"Not Applicable",
+ 	"None", "empty",
+-- 
+2.12.2
+