diff --git a/meta-sysmocom-bsp/.gitignore b/meta-sysmocom-bsp/.gitignore
new file mode 100644
index 0000000000..45d62d8696
--- /dev/null
+++ b/meta-sysmocom-bsp/.gitignore
@@ -0,0 +1 @@
+*.sw?
diff --git a/meta-sysmocom-bsp/classes/images_types_sysmo.bbclass b/meta-sysmocom-bsp/classes/images_types_sysmo.bbclass
new file mode 100644
index 0000000000..b46ad2ac3a
--- /dev/null
+++ b/meta-sysmocom-bsp/classes/images_types_sysmo.bbclass
@@ -0,0 +1,20 @@
+# I add another image type for the sysmoBTS family
+
+UBI_VOLNAME ?= "${MACHINE}-rootfs"
+
+IMAGE_CMD_ubi-sysmo () {
+	echo \[kernel\] >> ubinize_sysmo.cfg
+	echo mode=ubi >> ubinize_sysmo.cfg
+	echo image=${DEPLOY_DIR_IMAGE}/uImage-${MACHINE}.bin >> ubinize_sysmo.cfg
+	echo vol_id=0 >> ubinize_sysmo.cfg
+	echo vol_type=static >> ubinize_sysmo.cfg
+	echo vol_name=${MACHINE}-backup-kernel >> ubinize_sysmo.cfg
+	echo \[ubifs\] >> ubinize_sysmo.cfg 
+	echo mode=ubi >> ubinize_sysmo.cfg
+	echo image=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ubifs-sysmo >> ubinize_sysmo.cfg 
+	echo vol_id=1 >> ubinize_sysmo.cfg 
+	echo vol_type=dynamic >> ubinize_sysmo.cfg 
+	echo vol_name=${UBI_VOLNAME} >> ubinize_sysmo.cfg 
+	echo vol_flags=autoresize >> ubinize_sysmo.cfg
+	mkfs.ubifs -r ${IMAGE_ROOTFS} -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ubifs-sysmo ${MKUBIFS_ARGS} && ubinize -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ubi-sysmo ${UBINIZE_ARGS} ubinize_sysmo.cfg
+}
diff --git a/meta-sysmocom-bsp/conf/machine/sysmobts-v2.conf b/meta-sysmocom-bsp/conf/machine/sysmobts-v2.conf
index b86a9a1a78..586a44c5b0 100644
--- a/meta-sysmocom-bsp/conf/machine/sysmobts-v2.conf
+++ b/meta-sysmocom-bsp/conf/machine/sysmobts-v2.conf
@@ -7,7 +7,7 @@ EXTRA_IMAGEDEPENDS = "dvnixload-native ubl u-boot sysmobts-firmware"
 EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --pagesize=0x800 --no-cleanmarkers --pad=0x2000000 -n"
 
 # ubifs config
-MKUBIFS_ARGS ?= "-m 2048 -e 129024 -c 400"
+MKUBIFS_ARGS ?= "-m 2048 -e 129024 -c 999"
 UBINIZE_ARGS ?= "-m 2048 -p 128KiB -s 512"
 
 
diff --git a/meta-sysmocom-bsp/recipes-apps/busybox/busybox_sysmocom.inc b/meta-sysmocom-bsp/recipes-apps/busybox/busybox_sysmocom.inc
index 4f0c2aa2d6..32eb10762a 100644
--- a/meta-sysmocom-bsp/recipes-apps/busybox/busybox_sysmocom.inc
+++ b/meta-sysmocom-bsp/recipes-apps/busybox/busybox_sysmocom.inc
@@ -1,6 +1,6 @@
 SYSMOCOM := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
 FILESEXTRAPATHS_prepend := "${SYSMOCOM}/files:"
-PRINC = "7"
+PRINC = "15"
 
 SRC_URI += "file://busybox-ifplugd.sh \
             file://ifplugd.sh"
diff --git a/meta-sysmocom-bsp/recipes-apps/busybox/files/busybox-ifplugd.sh b/meta-sysmocom-bsp/recipes-apps/busybox/files/busybox-ifplugd.sh
index c66847f1ba..d8c0bb8530 100644
--- a/meta-sysmocom-bsp/recipes-apps/busybox/files/busybox-ifplugd.sh
+++ b/meta-sysmocom-bsp/recipes-apps/busybox/files/busybox-ifplugd.sh
@@ -20,10 +20,7 @@ case "$1" in
 	echo "done."
 	;;
     restart)
-        echo "restarting $DESC: $NAME... "
- 	$0 stop
-	$0 start
-	echo "done."
+        echo "Not restarting $DESC: $NAME... "
 	;;
     reload)
     	echo -n "reloading $DESC: $NAME... "
diff --git a/meta-sysmocom-bsp/recipes-apps/busybox/files/defconfig b/meta-sysmocom-bsp/recipes-apps/busybox/files/defconfig
index 96cd6385b9..361e51d93f 100644
--- a/meta-sysmocom-bsp/recipes-apps/busybox/files/defconfig
+++ b/meta-sysmocom-bsp/recipes-apps/busybox/files/defconfig
@@ -552,7 +552,7 @@ CONFIG_MOUNT=y
 # CONFIG_FEATURE_MOUNT_HELPERS is not set
 # CONFIG_FEATURE_MOUNT_LABEL is not set
 CONFIG_FEATURE_MOUNT_NFS=y
-# CONFIG_FEATURE_MOUNT_CIFS is not set
+CONFIG_FEATURE_MOUNT_CIFS=y
 CONFIG_FEATURE_MOUNT_FLAGS=y
 CONFIG_FEATURE_MOUNT_FSTAB=y
 CONFIG_PIVOT_ROOT=y
diff --git a/meta-sysmocom-bsp/recipes-apps/busybox/files/syslog b/meta-sysmocom-bsp/recipes-apps/busybox/files/syslog
new file mode 100644
index 0000000000..88397e2a96
--- /dev/null
+++ b/meta-sysmocom-bsp/recipes-apps/busybox/files/syslog
@@ -0,0 +1,77 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides:             sysklogd
+# Required-Start:       $remote_fs $time
+# Required-Stop:        $remote_fs $time
+# Default-Start:        2 3 4 5
+# Default-Stop:         0 1 6
+# Short-Description:    System logger
+### END INIT INFO
+
+set -e
+
+if [ -f /etc/syslog.conf ]; then
+	. /etc/syslog.conf
+	LOG_LOCAL=0
+	LOG_REMOTE=0
+	for D in $DESTINATION; do
+		if [ "$D" = "buffer" ]; then
+			SYSLOG_ARGS="$SYSLOG_ARGS -C$BUFFERSIZE"
+			LOG_LOCAL=1
+		elif [ "$D" = "file" ]; then
+			if [ -n "$LOGFILE" ]; then
+				SYSLOG_ARGS="$SYSLOG_ARGS -O $LOGFILE"
+			fi
+			if [ -n "$ROTATESIZE" ]; then
+				SYSLOG_ARGS="$SYSLOG_ARGS -s $ROTATESIZE"
+			fi
+			if [ -n "$ROTATEGENS" ]; then
+				SYSLOG_ARGS="$SYSLOG_ARGS -b $ROTATEGENS"
+			fi
+			LOCAL=0
+		elif [ "$D" = "remote" ]; then
+			SYSLOG_ARGS="$SYSLOG_ARGS -R $REMOTE"
+			LOG_REMOTE=1
+		fi
+	done
+	if [ "$LOG_LOCAL" = "1" -a "$LOG_REMOTE" = "1" ]; then
+		SYSLOG_ARGS="$SYSLOG_ARGS -L"
+	fi
+	if [ "$REDUCE" = "yes" ]; then
+		SYSLOG_ARGS="$SYSLOG_ARGS -S"
+	fi
+	if [ "$DROPDUPLICATES" = "yes" ]; then
+	    SYSLOG_ARGS="$SYSLOG_ARGS -D"
+	fi
+	if [ -n "$LOGLEVEL" ]; then
+	    SYSLOG_ARGS="$SYSLOG_ARGS -l $LOGLEVEL"
+	fi
+else
+	# default: log to 16K shm circular buffer
+	SYSLOG_ARGS="-C"
+fi
+
+case "$1" in
+  start)
+	echo -n "Starting syslogd/klogd: "
+	start-stop-daemon -S -b -n syslogd -a /sbin/syslogd -- -n $SYSLOG_ARGS
+	start-stop-daemon -S -b -n klogd -a /sbin/klogd -- -n
+	echo "done"
+	;;
+  stop)
+	echo -n "Stopping syslogd/klogd: "
+	start-stop-daemon -K -n syslogd
+	start-stop-daemon -K -n klogd
+	echo "done"
+	;;
+  restart)
+  	$0 stop
+	$0 start
+	;;
+  *)
+	echo "Usage: syslog { start | stop | restart }" >&2
+	exit 1
+	;;
+esac
+
+exit 0
diff --git a/meta-sysmocom-bsp/recipes-apps/busybox/files/syslog.conf b/meta-sysmocom-bsp/recipes-apps/busybox/files/syslog.conf
new file mode 100644
index 0000000000..f3d81fef4f
--- /dev/null
+++ b/meta-sysmocom-bsp/recipes-apps/busybox/files/syslog.conf
@@ -0,0 +1,22 @@
+DESTINATION="buffer"		# log destinations (buffer file remote)
+MARKINT=20			# intervall between --mark-- entries
+LOGFILE=/var/log/messages	# where to log (file)
+REMOTE=loghost:514		# where to log (syslog remote)
+REDUCE=no			# reduce-size logging
+#ROTATESIZE=0			# rotate log if grown beyond X [kByte] (incompatible with busybox)
+#ROTATEGENS=3			# keep X generations of rotated logs (incompatible with busybox)
+BUFFERSIZE=64			# size of circular buffer [kByte]
+FOREGROUND=no			# run in foreground (don't use!)
+LOGLEVEL=6
+
+# magic when a MMC card is mounted
+USING_MMC_CARD=`/bin/mount | grep /media/mmcblk0p1 | wc -l`
+if [ 1 -eq $USING_MMC_CARD ] ; then
+	if [ -e /media/mmcblk0p1/log ] ; then
+		echo "Using mmc card"
+		LOGFILE=/media/mmcblk0p1/log/messages
+		DESTINATION="file"
+		ROTATESIZE=2048
+		ROTATEGENS=20
+	fi
+fi
diff --git a/meta-sysmocom-bsp/recipes-apps/images/sysmocom-bsc-e1-image-directdisk.bb b/meta-sysmocom-bsp/recipes-apps/images/sysmocom-bsc-e1-image-directdisk.bb
index 3ab18d558d..4ae1318c69 100644
--- a/meta-sysmocom-bsp/recipes-apps/images/sysmocom-bsc-e1-image-directdisk.bb
+++ b/meta-sysmocom-bsp/recipes-apps/images/sysmocom-bsc-e1-image-directdisk.bb
@@ -7,13 +7,6 @@ LICENSE = "MIT"
 inherit boot-directdisk
 
 
-do_bootdirectdisk_prepend () {
-	import bb
-	fstypes = bb.data.getVar('IMAGE_FSTYPES', d, True)
-	if 'ext3' not in fstypes:
-		bb.msg.fatal(bb.msg.domain.Build, "ext3 not in IMAGE_FSTYPES")
-}
-
 ROOTFS = "${DEPLOY_DIR_IMAGE}/sysmocom-bsc-e1-image-${MACHINE}.ext3"
 do_bootdirectdisk[depends] += "sysmocom-bsc-e1-image:do_rootfs"
 
diff --git a/meta-sysmocom-bsp/recipes-apps/images/sysmocom-bsc-ip-image-directdisk.bb b/meta-sysmocom-bsp/recipes-apps/images/sysmocom-bsc-ip-image-directdisk.bb
index 0ebfa93964..6dc4aea4b5 100644
--- a/meta-sysmocom-bsp/recipes-apps/images/sysmocom-bsc-ip-image-directdisk.bb
+++ b/meta-sysmocom-bsp/recipes-apps/images/sysmocom-bsc-ip-image-directdisk.bb
@@ -7,13 +7,6 @@ LICENSE = "MIT"
 inherit boot-directdisk
 
 
-do_bootdirectdisk_prepend () {
-	import bb
-	fstypes = bb.data.getVar('IMAGE_FSTYPES', d, True)
-	if 'ext3' not in fstypes:
-		bb.msg.fatal(bb.msg.domain.Build, "ext3 not in IMAGE_FSTYPES")
-}
-
 ROOTFS = "${DEPLOY_DIR_IMAGE}/sysmocom-bsc-ip-image-${MACHINE}.ext3"
 do_bootdirectdisk[depends] += "sysmocom-bsc-ip-image:do_rootfs"
 
diff --git a/meta-sysmocom-bsp/recipes-apps/tasks/task-sysmocom-debug.bb b/meta-sysmocom-bsp/recipes-apps/tasks/task-sysmocom-debug.bb
index a5d3291074..5612b9ebc3 100644
--- a/meta-sysmocom-bsp/recipes-apps/tasks/task-sysmocom-debug.bb
+++ b/meta-sysmocom-bsp/recipes-apps/tasks/task-sysmocom-debug.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 DEPENDS = "virtual/kernel"
 ALLOW_EMPTY = "1"
-PR = "r2"
+PR = "r3"
 
 RDEPENDS_task-sysmocom-debug = "\
     dropbear \
@@ -13,7 +13,6 @@ RDEPENDS_task-sysmocom-debug = "\
     tcpdump \
     gdb \
     gdbserver \
-    oprofile \
     net-tools \
     "
 
diff --git a/meta-sysmocom-bsp/recipes-apps/tasks/task-sysmocom-tools.bb b/meta-sysmocom-bsp/recipes-apps/tasks/task-sysmocom-tools.bb
index 30bbf19f2a..709b5f4ac1 100644
--- a/meta-sysmocom-bsp/recipes-apps/tasks/task-sysmocom-tools.bb
+++ b/meta-sysmocom-bsp/recipes-apps/tasks/task-sysmocom-tools.bb
@@ -3,7 +3,7 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 ALLOW_EMPTY = "1"
-PR = "r6"
+PR = "r7"
 
 RDEPENDS_task-sysmocom-tools = "\
     lmsensors-scripts \
@@ -12,4 +12,7 @@ RDEPENDS_task-sysmocom-tools = "\
     screen \
     ethtool \
     ntpdate \
+    wget \
+    ca-cacert-rootcert \
+    sysmocom-backup \
     "
diff --git a/meta-sysmocom-bsp/recipes-apps/tasks/task-sysmocom.bb b/meta-sysmocom-bsp/recipes-apps/tasks/task-sysmocom.bb
index 730f561583..3d784ae06f 100644
--- a/meta-sysmocom-bsp/recipes-apps/tasks/task-sysmocom.bb
+++ b/meta-sysmocom-bsp/recipes-apps/tasks/task-sysmocom.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 DEPENDS = "virtual/kernel"
 ALLOW_EMPTY = "1"
-PR = "r10"
+PR = "r11"
 
 RDEPENDS_task-sysmocom = "\
     task-sysmocom-tools \
@@ -14,8 +14,5 @@ RDEPENDS_task-sysmocom = "\
     osmo-gbproxy \
     osmo-nitb \
     ipaccess-utils \
-    wget \
-    ca-cacert-rootcert \
-    sysmocom-backup \
     "
 
diff --git a/meta-sysmocom-bsp/recipes-bsp/linux/files/sysmobts-v1/defconfig b/meta-sysmocom-bsp/recipes-bsp/linux/files/sysmobts-v1/defconfig
index 2b310f8a4b..b25fb76d00 100644
--- a/meta-sysmocom-bsp/recipes-bsp/linux/files/sysmobts-v1/defconfig
+++ b/meta-sysmocom-bsp/recipes-bsp/linux/files/sysmobts-v1/defconfig
@@ -1415,8 +1415,22 @@ CONFIG_IOMMU_SUPPORT=y
 # File systems
 #
 # CONFIG_EXT2_FS is not set
-# CONFIG_EXT3_FS is not set
-# CONFIG_EXT4_FS is not set
+CONFIG_EXT3_FS=m
+CONFIG_EXT3_DEFAULTS_TO_ORDERED=y
+CONFIG_EXT3_FS_XATTR=y
+# CONFIG_EXT3_FS_POSIX_ACL is not set
+# CONFIG_EXT3_FS_SECURITY is not set
+CONFIG_EXT4_FS=m
+CONFIG_EXT4_USE_FOR_EXT23=y
+CONFIG_EXT4_FS_XATTR=y
+# CONFIG_EXT4_FS_POSIX_ACL is not set
+# CONFIG_EXT4_FS_SECURITY is not set
+# CONFIG_EXT4_DEBUG is not set
+CONFIG_JBD=m
+# CONFIG_JBD_DEBUG is not set
+CONFIG_JBD2=m
+# CONFIG_JBD2_DEBUG is not set
+CONFIG_FS_MBCACHE=m
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
 # CONFIG_XFS_FS is not set
diff --git a/meta-sysmocom-bsp/recipes-bsp/linux/files/sysmobts-v2/defconfig b/meta-sysmocom-bsp/recipes-bsp/linux/files/sysmobts-v2/defconfig
index 4ca8232052..ef95f8905c 100644
--- a/meta-sysmocom-bsp/recipes-bsp/linux/files/sysmobts-v2/defconfig
+++ b/meta-sysmocom-bsp/recipes-bsp/linux/files/sysmobts-v2/defconfig
@@ -1055,8 +1055,8 @@ CONFIG_DEVKMEM=y
 #
 CONFIG_SERIAL_8250=y
 CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_SERIAL_8250_NR_UARTS=3
-CONFIG_SERIAL_8250_RUNTIME_UARTS=3
+CONFIG_SERIAL_8250_NR_UARTS=5
+CONFIG_SERIAL_8250_RUNTIME_UARTS=5
 # CONFIG_SERIAL_8250_EXTENDED is not set
 
 #
@@ -1347,7 +1347,7 @@ CONFIG_DUMMY_CONSOLE=y
 # CONFIG_SOUND is not set
 # CONFIG_HID_SUPPORT is not set
 # CONFIG_USB_SUPPORT is not set
-CONFIG_MMC=m
+CONFIG_MMC=y
 # CONFIG_MMC_DEBUG is not set
 # CONFIG_MMC_UNSAFE_RESUME is not set
 # CONFIG_MMC_CLKGATE is not set
@@ -1355,7 +1355,7 @@ CONFIG_MMC=m
 #
 # MMC/SD/SDIO Card Drivers
 #
-CONFIG_MMC_BLOCK=m
+CONFIG_MMC_BLOCK=y
 CONFIG_MMC_BLOCK_MINORS=8
 CONFIG_MMC_BLOCK_BOUNCE=y
 # CONFIG_SDIO_UART is not set
@@ -1367,7 +1367,7 @@ CONFIG_MMC_BLOCK_BOUNCE=y
 # CONFIG_MMC_SDHCI is not set
 # CONFIG_MMC_SDHCI_PXAV3 is not set
 # CONFIG_MMC_SDHCI_PXAV2 is not set
-CONFIG_MMC_DAVINCI=m
+CONFIG_MMC_DAVINCI=y
 # CONFIG_MMC_DW is not set
 # CONFIG_MEMSTICK is not set
 CONFIG_NEW_LEDS=y
diff --git a/meta-sysmocom-bsp/recipes-bsp/linux/linux-sysmocom_git.bb b/meta-sysmocom-bsp/recipes-bsp/linux/linux-sysmocom_git.bb
index c9b43ab6a8..265a774485 100644
--- a/meta-sysmocom-bsp/recipes-bsp/linux/linux-sysmocom_git.bb
+++ b/meta-sysmocom-bsp/recipes-bsp/linux/linux-sysmocom_git.bb
@@ -1,7 +1,7 @@
 inherit kernel
 require linux-sysmocom.inc
 
-LINUX_VERSION ?= "3.2.36"
+LINUX_VERSION ?= "3.2.40"
 LINUX_VERSION_EXTENSION ?= "-sysmocom-${LINUX_KERNEL_TYPE}"
 
 # Overrides for the sysmocom bts v1
@@ -10,9 +10,9 @@ BTS_FIRMWARE_NAME_sysmobts-v1 = "sysmobts-v1"
 # Overrides for the sysmocom bts v2
 BTS_FIRMWARE_NAME_sysmobts-v2 = "sysmobts-v2"
 
-SRCREV = "1db46a2b69e034677802b2c83b7d523b4338769f"
+SRCREV = "996c4d772886fa81ffa5d2d971ef88e6da41e115"
 
-PR = "r27"
+PR = "r29"
 PV = "${LINUX_VERSION}+git${SRCPV}"
 
 SRC_URI = "git://git.sysmocom.de/sysmo-bts/linux.git;protocol=git;branch=v3.2 \
diff --git a/meta-sysmocom-bsp/recipes-bsp/meta/meta-toolchain-sysmobts.bb b/meta-sysmocom-bsp/recipes-bsp/meta/meta-toolchain-sysmobts.bb
new file mode 100644
index 0000000000..afddeb2382
--- /dev/null
+++ b/meta-sysmocom-bsp/recipes-bsp/meta/meta-toolchain-sysmobts.bb
@@ -0,0 +1,9 @@
+# Depend on the osmocom toolchain
+require recipes-osmocom/meta/meta-toolchain-osmo.bb
+
+# Change the name
+TOOLCHAIN_OUTPUTNAME = "${SDK_NAME}-toolchain-sysmobts-${DISTRO_VERSION}-${DATETIME}"
+
+# Add API headers..
+TOOLCHAIN_TARGET_TASK += "femtobts-api-dev"
+
diff --git a/meta-sysmocom-bsp/recipes-bsp/watchdog/watchdog/init b/meta-sysmocom-bsp/recipes-bsp/watchdog/watchdog/init
index cdc960a6e8..4d75dfe3a3 100644
--- a/meta-sysmocom-bsp/recipes-bsp/watchdog/watchdog/init
+++ b/meta-sysmocom-bsp/recipes-bsp/watchdog/watchdog/init
@@ -5,8 +5,8 @@
 ### BEGIN INIT INFO
 # Provides:          watchdog
 # Short-Description: Start software watchdog daemon
-# Required-Start:    $all
-# Required-Stop:     $all
+# Required-Start:    $local_fs
+# Required-Stop:
 # Should-Start:      
 # Should-Stop:       
 # Default-Start:     S
@@ -67,8 +67,8 @@ case "$1" in
   force-reload)
     if [ $run_watchdog = 0 ]; then exit 0; fi
     echo "Restarting ${NAME}"
-    stop
-    start
+    $0 stop
+    $0 start
     ;;
 
   *)
diff --git a/meta-sysmocom-bsp/recipes-bsp/watchdog/watchdog_sysmocom.inc b/meta-sysmocom-bsp/recipes-bsp/watchdog/watchdog_sysmocom.inc
index 1362ddd019..7d09be3bce 100644
--- a/meta-sysmocom-bsp/recipes-bsp/watchdog/watchdog_sysmocom.inc
+++ b/meta-sysmocom-bsp/recipes-bsp/watchdog/watchdog_sysmocom.inc
@@ -1,6 +1,6 @@
 SYSMOCOM := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
 FILESEXTRAPATHS_prepend := "${SYSMOCOM}/${PN}-${PV}:${SYSMOCOM}/${PN}"
-PRINC = "7"
+PRINC = "8"
 
 inherit update-rc.d
 
diff --git a/meta-sysmocom-bsp/recipes-config/openggsn-config/files/sysmobts-v2/ggsn.conf b/meta-sysmocom-bsp/recipes-config/openggsn-config/files/sysmobts-v2/ggsn.conf
index 138e7af738..024270233e 100644
--- a/meta-sysmocom-bsp/recipes-config/openggsn-config/files/sysmobts-v2/ggsn.conf
+++ b/meta-sysmocom-bsp/recipes-config/openggsn-config/files/sysmobts-v2/ggsn.conf
@@ -33,7 +33,7 @@
 # TAG: listen
 # Specifies the local IP address to listen to
 #listen 10.0.0.240
-listen 10.23.123.1
+listen 127.0.0.2
 
 # TAG: net
 # IP network address of external packet data network
diff --git a/meta-sysmocom-bsp/recipes-config/openggsn-config/gprs-routing_0.1.bb b/meta-sysmocom-bsp/recipes-config/openggsn-config/gprs-routing_0.1.bb
index c6250b02af..df053bc065 100644
--- a/meta-sysmocom-bsp/recipes-config/openggsn-config/gprs-routing_0.1.bb
+++ b/meta-sysmocom-bsp/recipes-config/openggsn-config/gprs-routing_0.1.bb
@@ -1,11 +1,12 @@
 DESCRIPTION = "OpenGGSN GPRS routing to the real world"
-RDEPENDS = "iptables kernel-module-ipt-masquerade"
+RDEPENDS_${PN} = "iptables kernel-module-ipt-masquerade"
 
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
 
 SRC_URI = "file://gprs_routing"
 
+PR = "r1"
 
 inherit update-rc.d
 
diff --git a/meta-sysmocom-bsp/recipes-extra/debootstrap/debootstrap_1.0.42.bb b/meta-sysmocom-bsp/recipes-extra/debootstrap/debootstrap_1.0.42.bb
index 4f524dc586..adb6a51b75 100644
--- a/meta-sysmocom-bsp/recipes-extra/debootstrap/debootstrap_1.0.42.bb
+++ b/meta-sysmocom-bsp/recipes-extra/debootstrap/debootstrap_1.0.42.bb
@@ -7,8 +7,8 @@ LICENSE="MIT"
 LIC_FILES_CHKSUM = "file://debian/copyright;md5=1e68ced6e1689d4cd9dac75ff5225608"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/d/debootstrap/debootstrap_${PV}.tar.gz"
-PR = "r5"
-RDEPENDS = "wget gnupg coreutils"
+PR = "r6"
+RDEPENDS_${PN} = "wget gnupg coreutils"
 
 inherit autotools
 
diff --git a/meta-sysmocom-bsp/recipes-extra/gpsd/gpsd/gpsd b/meta-sysmocom-bsp/recipes-extra/gpsd/gpsd/gpsd
index ba73dafb2c..d4ec051da0 100755
--- a/meta-sysmocom-bsp/recipes-extra/gpsd/gpsd/gpsd
+++ b/meta-sysmocom-bsp/recipes-extra/gpsd/gpsd/gpsd
@@ -70,7 +70,7 @@ do_stop()
 	#   1 if daemon was already stopped
 	#   2 if daemon could not be stopped
 	#   other if a failure occurred
-	start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME
+	start-stop-daemon --stop --quiet --pidfile $PIDFILE
 	RETVAL="$?"
 	[ "$RETVAL" = 2 ] && return 2
 	# Many daemons don't delete their pidfiles when they exit.
diff --git a/meta-sysmocom-bsp/recipes-extra/gpsd/gpsd/sysmobts-v2/gpsd.default b/meta-sysmocom-bsp/recipes-extra/gpsd/gpsd/sysmobts-v2/gpsd.default
new file mode 100644
index 0000000000..e37c3b56dd
--- /dev/null
+++ b/meta-sysmocom-bsp/recipes-extra/gpsd/gpsd/sysmobts-v2/gpsd.default
@@ -0,0 +1,5 @@
+# If you must specify a non-NMEA driver, uncomment and modify the next line
+GPSD_SOCKET="/var/run/gpsd.sock"
+GPSD_OPTIONS="" 
+GPS_DEVICES="udp://127.0.0.1:12345 udp://127.0.0.1:12346"
+
diff --git a/meta-sysmocom-bsp/recipes-extra/gpsd/gpsd_3.7.bb b/meta-sysmocom-bsp/recipes-extra/gpsd/gpsd_3.7.bb
index 460dc886bf..e833187f68 100644
--- a/meta-sysmocom-bsp/recipes-extra/gpsd/gpsd_3.7.bb
+++ b/meta-sysmocom-bsp/recipes-extra/gpsd/gpsd_3.7.bb
@@ -2,13 +2,13 @@ DESCRIPTION = "A TCP/IP Daemon simplifying the communication with GPS devices"
 SECTION = "console/network"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d217a23f408e91c94359447735bc1800"
-DEPENDS = "ncurses"
+DEPENDS = "ncurses chrpath-native python"
 #DEPENDS = "ncurses libusb1 python"
 PROVIDES = "virtual/gpsd"
 
 EXTRANATIVEPATH += "chrpath-native"
 
-PR = "r3.4"
+PR = "r3.6"
 
 SRC_URI = "http://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz \
   file://0002-SConstruct-respect-sysroot-also-in-SPLINTOPTS.patch \
@@ -18,7 +18,6 @@ SRC_URI = "http://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz \
   file://gpsd \
   file://60-gpsd.rules \
 "
-#file://0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch \
 SRC_URI[md5sum] = "52d9785eaf1a51298bb8900dbde88f98"
 SRC_URI[sha256sum] = "7800c478ee9d7ca7a502b0f892828561b1fbf7bc69d9d38c447c82c3628302ac"
 
diff --git a/meta-sysmocom-bsp/recipes-extra/gpsdate/gpsdate_git.bb b/meta-sysmocom-bsp/recipes-extra/gpsdate/gpsdate_git.bb
new file mode 100644
index 0000000000..39a06dbc7b
--- /dev/null
+++ b/meta-sysmocom-bsp/recipes-extra/gpsdate/gpsdate_git.bb
@@ -0,0 +1,25 @@
+DESCRIPTION = "A utility to set system RTC to GPSD time"
+SECTION = "console/network"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
+DEPENDS = "gpsd"
+RDEPENDS = "libgps"
+
+PR = "r6"
+
+SRC_URI = "git://git.sysmocom.de/gpsdate.git;branch=master \
+"
+SRCREV = "86320146407ecee208ca03428a7424412f272024"
+S = ${WORKDIR}/git
+
+INITSCRIPT_NAME = "gpsdate"
+INITSCRIPT_PARAMS = "defaults 35"
+
+inherit update-rc.d
+
+do_install() {
+    install -d ${D}/${sbindir}
+    install -m 0755 ${S}/gpsdate ${D}/${sbindir}/gpsdate
+    install -d ${D}/${sysconfdir}/init.d
+    install -m 0755 ${S}/gpsdate.init ${D}/${sysconfdir}/init.d/gpsdate
+}
diff --git a/meta-sysmocom-bsp/recipes-extra/lm_sensors/lmsensors-apps_3.2.0.bb b/meta-sysmocom-bsp/recipes-extra/lm_sensors/lmsensors-apps_3.2.0.bb
index 7aadb383ab..1dd8081d8d 100644
--- a/meta-sysmocom-bsp/recipes-extra/lm_sensors/lmsensors-apps_3.2.0.bb
+++ b/meta-sysmocom-bsp/recipes-extra/lm_sensors/lmsensors-apps_3.2.0.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.lm-sensors.org/"
 DEPENDS = "sysfsutils virtual/libiconv"
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
-PR = "r4"
+PR = "r5"
 DEPENDS = "bison-native flex-native"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
@@ -15,7 +15,8 @@ SRC_URI[sha256sum] = "bde7e1d8b473bca6528694b696668c4cd0a28515aef36b961e4f7d8a6b
 S = "${WORKDIR}/lm_sensors-${PV}"
 
 EXTRA_OEMAKE = 'LINUX=${STAGING_KERNEL_DIR} EXLDFLAGS="${LDFLAGS}" \
-		MACHINE=${TARGET_ARCH} PREFIX=${prefix} CC="${CC}" AR="${AR}"'
+		MACHINE=${TARGET_ARCH} PREFIX=${prefix} CC="${CC}" AR="${AR}" \
+		MANDIR="${mandir}"'
 
 do_compile() {
 	oe_runmake user PROG_EXTRA=sensors
@@ -23,11 +24,6 @@ do_compile() {
 
 do_install() {
 	oe_runmake user_install DESTDIR=${D}
-
-	# move manuals into proper place
-	install -d ${D}${mandir}
-	rm -rf ${D}${mandir}/*
-	mv ${D}/usr/man/* ${D}${mandir}
 }
 
 PACKAGES =+  "libsensors libsensors-dev libsensors-staticdev libsensors-dbg libsensors-doc"
diff --git a/meta-sysmocom-bsp/recipes-extra/uucp/files/policy.patch b/meta-sysmocom-bsp/recipes-extra/uucp/files/policy.patch
new file mode 100644
index 0000000000..26f1f172b8
--- /dev/null
+++ b/meta-sysmocom-bsp/recipes-extra/uucp/files/policy.patch
@@ -0,0 +1,85 @@
+Index: uucp-1.07/policy.h
+===================================================================
+--- uucp-1.07.orig/policy.h	2003-05-29 06:08:45.000000000 +0000
++++ uucp-1.07/policy.h	2007-03-09 00:51:55.000000000 +0000
+@@ -240,7 +240,7 @@
+    the sendmail choice below.  Otherwise, select one of the other
+    choices as appropriate.  */
+ #if 1
+-#define MAIL_PROGRAM "/usr/lib/sendmail -t"
++#define MAIL_PROGRAM "/usr/sbin/sendmail -oi -t"
+ /* #define MAIL_PROGRAM "/usr/sbin/sendmail -t" */
+ #define MAIL_PROGRAM_TO_BODY 1
+ #define MAIL_PROGRAM_SUBJECT_BODY 1
+@@ -302,7 +302,7 @@
+ /* #define LOCKDIR "/usr/spool/locks" */
+ /* #define LOCKDIR "/usr/spool/uucp/LCK" */
+ /* #define LOCKDIR "/var/spool/lock" */
+-/* #define LOCKDIR "/var/lock" */
++#define LOCKDIR "/var/lock"
+ 
+ /* You must also specify the format of the lock files by setting
+    exactly one of the following macros to 1.  Check an existing lock
+@@ -349,7 +349,7 @@
+    The format for QNX lock files was made up just for Taylor UUCP.
+    QNX doesn't come with a version of UUCP.  */
+ #define HAVE_V2_LOCKFILES 0
+-#define HAVE_HDB_LOCKFILES 0
++#define HAVE_HDB_LOCKFILES 1
+ #define HAVE_SCO_LOCKFILES 0
+ #define HAVE_SVR4_LOCKFILES 0
+ #define HAVE_SEQUENT_LOCKFILES 0
+@@ -466,8 +466,8 @@
+    When looking something up (a system, a port, etc.) the new style
+    configuration files will be read first, followed by the V2
+    configuration files, followed by the HDB configuration files.  */
+-#define HAVE_V2_CONFIG 0
+-#define HAVE_HDB_CONFIG 0
++#define HAVE_V2_CONFIG 1
++#define HAVE_HDB_CONFIG 1
+ 
+ /* Exactly one of the following macros must be set to 1.  The exact
+    format of the spool directories is explained in unix/spool.c.
+@@ -572,7 +572,7 @@
+ /* The name of the default spool directory.  If HAVE_TAYLOR_CONFIG is
+    set to 1, this may be overridden by the ``spool'' command in the
+    configuration file.  */
+-#define SPOOLDIR "/usr/spool/uucp"
++#define SPOOLDIR "/var/spool/uucp"
+ /* #define SPOOLDIR "/var/spool/uucp" */
+ 
+ /* The name of the default public directory.  If HAVE_TAYLOR_CONFIG is
+@@ -580,7 +580,7 @@
+    configuration file.  Also, a particular system may be given a
+    specific public directory by using the ``pubdir'' command in the
+    system file.  */
+-#define PUBDIR "/usr/spool/uucppublic"
++#define PUBDIR "/var/spool/uucppublic"
+ /* #define PUBDIR "/var/spool/uucppublic" */
+ 
+ /* The default command path.  This is a space separated list of
+@@ -644,21 +644,21 @@
+ /* The default log file when using HAVE_TAYLOR_LOGGING.  When using
+    HAVE_TAYLOR_CONFIG, this may be overridden by the ``logfile''
+    command in the configuration file.  */
+-#define LOGFILE "/usr/spool/uucp/Log"
++#define LOGFILE "/var/spool/uucp/Log"
+ /* #define LOGFILE "/var/spool/uucp/Log" */
+ /* #define LOGFILE "/var/log/uucp/Log" */
+ 
+ /* The default statistics file when using HAVE_TAYLOR_LOGGING.  When
+    using HAVE_TAYLOR_CONFIG, this may be overridden by the
+    ``statfile'' command in the configuration file.  */
+-#define STATFILE "/usr/spool/uucp/Stats"
++#define STATFILE "/var/spool/uucp/Stats"
+ /* #define STATFILE "/var/spool/uucp/Stats" */
+ /* #define STATFILE "/var/log/uucp/Stats" */
+ 
+ /* The default debugging file when using HAVE_TAYLOR_LOGGING.  When
+    using HAVE_TAYLOR_CONFIG, this may be overridden by the
+    ``debugfile'' command in the configuration file.  */
+-#define DEBUGFILE "/usr/spool/uucp/Debug"
++#define DEBUGFILE "/var/spool/uucp/Debug"
+ /* #define DEBUGFILE "/var/spool/uucp/Debug" */
+ /* #define DEBUGFILE "/var/log/uucp/Debug" */
+ 
diff --git a/meta-sysmocom-bsp/recipes-extra/uucp/uucp_1.07.bb b/meta-sysmocom-bsp/recipes-extra/uucp/uucp_1.07.bb
new file mode 100644
index 0000000000..4221833270
--- /dev/null
+++ b/meta-sysmocom-bsp/recipes-extra/uucp/uucp_1.07.bb
@@ -0,0 +1,37 @@
+DESCRIPTION = "UUCP is used to transfer mail, news and random files between systems which are not connected by more modern networks. The communication can be made via modems, direct (hard-wired) serial connections or via an IP connection."
+HOMEPAGE = "http://www.airs.com/ian/uucp.html"
+SECTION = "console/utils"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
+PR = "r3.4"
+
+inherit autotools
+
+SRC_URI = "ftp://ftp.gnu.org/pub/gnu/uucp/uucp-${PV}.tar.gz \
+           file://policy.patch"
+
+do_configure() {
+	libtoolize --force
+	oe_runconf
+}
+
+EXTRA_OECONF = "--with-newconfigdir=/etc/uucp"
+
+do_install_append() {
+    install -d ${D}/var/spool/uucp
+}
+
+pkg_postinst_${PN} () {
+	if [ "x$D" != "x" ] ; then
+		exit 1
+	fi
+
+	chown uucp:uucp /var/spool/uucp
+	chmod 770 /var/spool/uucp
+}
+
+PACKAGES =+ "cu"
+FILES_cu = "${bindir}/cu /var/spool"
+
+SRC_URI[md5sum] = "64c54d43787339a7cced48390eb3e1d0"
+SRC_URI[sha256sum] = "060c15bfba6cfd1171ad81f782789032113e199a5aded8f8e0c1c5bd1385b62c"
diff --git a/meta-sysmocom-bsp/recipes-sysmobts/femtobts-api/femtobts-api_git.bb b/meta-sysmocom-bsp/recipes-sysmobts/femtobts-api/femtobts-api_git.bb
index bf948bdf58..d3d6313955 100644
--- a/meta-sysmocom-bsp/recipes-sysmobts/femtobts-api/femtobts-api_git.bb
+++ b/meta-sysmocom-bsp/recipes-sysmobts/femtobts-api/femtobts-api_git.bb
@@ -3,13 +3,16 @@ SECTION = "kernel"
 LICENSE = "CLOSED"
 
 SRC_URI = "git://git.sysmocom.de/sysmo-bts/layer1-api.git;protocol=git;branch=master"
-SRCREV = "superfemto_v3.0.1pre"
-SRCREV_sysmobts-v2 = "superfemto_v3.0.1pre"
-SRCREV_sysmobts-v1 = "femtobts_v2.7"
+SRCREV = "6eb9bcf22ca5163594d4d0d8ec7dd580d411d1ea"
+SRCREV_sysmobts-v2 = "6eb9bcf22ca5163594d4d0d8ec7dd580d411d1ea"
+SRCREV_sysmobts-v1 = "4dde9443e2aa11868e46a67529cb5ac45462699c"
 PV = "${SRCREV}+git${SRCPV}"
-PR = "r2"
+PR = "r3"
 S = "${WORKDIR}/git"
 
+# The API is only a header, nothing to compile
+RDEPENDS_${PN}-dev = ""
+
 
 do_compile() {
 	:
diff --git a/meta-sysmocom-bsp/recipes-sysmobts/firmware/sysmobts-firmware_3.2.bb b/meta-sysmocom-bsp/recipes-sysmobts/firmware/sysmobts-firmware_3.2.bb
new file mode 100644
index 0000000000..c011570a98
--- /dev/null
+++ b/meta-sysmocom-bsp/recipes-sysmobts/firmware/sysmobts-firmware_3.2.bb
@@ -0,0 +1,14 @@
+COMPATIBLE_MACHINE = "sysmobts-v2"
+FIRMWARE-VERSION = "superfemto_v${PV}"
+PR = "r7.${INC_PR}"
+
+require ${PN}.inc
+
+do_install() {
+	install -d ${D}/lib/firmware/
+
+	install -m 0666 ${S}/Image/Dsp/superfemto.out ${D}/lib/firmware/sysmobts-v2.out
+	install -m 0666 ${S}/Image/Fpga/superfemto.bit ${D}/lib/firmware/sysmobts-v2.bit
+}
+
+FILES_${PN} = "/lib/firmware/sysmobts-v2*"
diff --git a/meta-sysmocom-bsp/recipes-sysmobts/firmware/sysmobts-firmware_3.3.bb b/meta-sysmocom-bsp/recipes-sysmobts/firmware/sysmobts-firmware_3.3.bb
new file mode 100644
index 0000000000..c011570a98
--- /dev/null
+++ b/meta-sysmocom-bsp/recipes-sysmobts/firmware/sysmobts-firmware_3.3.bb
@@ -0,0 +1,14 @@
+COMPATIBLE_MACHINE = "sysmobts-v2"
+FIRMWARE-VERSION = "superfemto_v${PV}"
+PR = "r7.${INC_PR}"
+
+require ${PN}.inc
+
+do_install() {
+	install -d ${D}/lib/firmware/
+
+	install -m 0666 ${S}/Image/Dsp/superfemto.out ${D}/lib/firmware/sysmobts-v2.out
+	install -m 0666 ${S}/Image/Fpga/superfemto.bit ${D}/lib/firmware/sysmobts-v2.bit
+}
+
+FILES_${PN} = "/lib/firmware/sysmobts-v2*"
diff --git a/meta-sysmocom-bsp/recipes-sysmobts/osmo-bts/osmo-bts_git.bb b/meta-sysmocom-bsp/recipes-sysmobts/osmo-bts/osmo-bts_git.bb
index 107e2983ca..51462a3d87 100644
--- a/meta-sysmocom-bsp/recipes-sysmobts/osmo-bts/osmo-bts_git.bb
+++ b/meta-sysmocom-bsp/recipes-sysmobts/osmo-bts/osmo-bts_git.bb
@@ -4,10 +4,10 @@ LIC_FILES_CHKSUM="file://COPYING;md5=73f1eb20517c55bf9493b7dd6e480788"
 
 SRC_URI = "git://git.osmocom.org/osmo-bts.git;protocol=git;branch=master;name=osmobts;destsuffix=git \
            git://git.osmocom.org/openbsc;protocol=git;branch=master;name=openbsc;destsuffix=openbsc"
-SRCREV_osmobts = "6a4c8a85967c54130f44e8339bf38b8dae1d2c6d"
-SRCREV_openbsc = "30156e1eea9dd5ac5c9f266e3095a942b75ef20a"
-PV = "0.1.0+git${SRCPV}"
-PR = "r9.${META_TELEPHONY_OSMO_INC}"
+SRCREV_osmobts = "cdc5a4dc384c91d5102376e08e3f34523e50b028"
+SRCREV_openbsc = "8b29180cad875b396288a22fb252e158fa2a060a"
+PV = "0.2.0+git${SRCPV}"
+PR = "r1.${META_TELEPHONY_OSMO_INC}"
 S = "${WORKDIR}/git"
 
 SRCREV_FORMAT = "openbsc-rosmobts"
diff --git a/meta-sysmocom-bsp/recipes-sysmobts/osmo-pcu/osmo-pcu_git.bb b/meta-sysmocom-bsp/recipes-sysmobts/osmo-pcu/osmo-pcu_git.bb
index 9714c4afac..1bb31e8069 100644
--- a/meta-sysmocom-bsp/recipes-sysmobts/osmo-pcu/osmo-pcu_git.bb
+++ b/meta-sysmocom-bsp/recipes-sysmobts/osmo-pcu/osmo-pcu_git.bb
@@ -3,13 +3,16 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM="file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
 SRC_URI = "git://git.osmocom.org/osmo-pcu.git;protocol=git;branch=jolly_merge"
-SRCREV = "72075f0e009e103e7cfa15edf42dc40d3c373128"
-PV = "0.1+git${SRCPV}"
-PR = "r13.${META_TELEPHONY_OSMO_INC}"
+SRCREV = "81a12be317bb5d2ad13bc27be1b2b1cb1605f4de"
+PV = "0.2+git${SRCPV}"
+PR = "r2.${META_TELEPHONY_OSMO_INC}"
 S = "${WORKDIR}/git"
 
 DEPENDS = "libosmocore femtobts-api osmo-bts"
 
+# This implements PCU Interface v5 (GPRS RSSI)
+RDEPENDS_${PN} = "osmo-bts (>= 0.2.0)"
+
 EXTRA_OECONF_sysmobts-v2 += "--enable-sysmocom-bts --enable-sysmocom-dsp"
 
 inherit autotools_stage
diff --git a/meta-sysmocom-bsp/recipes-sysmobts/uboot/u-boot_sysmocom.inc b/meta-sysmocom-bsp/recipes-sysmobts/uboot/u-boot_sysmocom.inc
index 70e15c8b7f..05ee0300ee 100644
--- a/meta-sysmocom-bsp/recipes-sysmobts/uboot/u-boot_sysmocom.inc
+++ b/meta-sysmocom-bsp/recipes-sysmobts/uboot/u-boot_sysmocom.inc
@@ -1,5 +1,5 @@
 SRC_URI = "git://git.sysmocom.de/sysmo-bts/u-boot;branch=v2011.12;protocol=git"
-SRCREV = "6633b83bf588ce21558a3bffb9e501479758c28b"
+SRCREV = "f289f5ed90c462f6b8f18ed787e9c27fc142fb6c"
 PV = "v2011.12+git${SRCPV}"
 S = "${WORKDIR}/git"
 
diff --git a/meta-sysmocom-bsp/yocto-edison/task-sdk-host-nativesdk.bbappend b/meta-sysmocom-bsp/yocto-edison/task-sdk-host-nativesdk.bbappend
new file mode 100644
index 0000000000..850e4b1b3b
--- /dev/null
+++ b/meta-sysmocom-bsp/yocto-edison/task-sdk-host-nativesdk.bbappend
@@ -0,0 +1,13 @@
+# There is no point in packing qemu...
+PRINC = "1"
+
+# qemu removed
+RDEPENDS_${PN} = "\
+    pkgconfig-nativesdk \
+    pseudo-nativesdk \
+    unfs-server-nativesdk \
+    opkg-nativesdk \
+    libtool-nativesdk \
+    autoconf-nativesdk \
+    automake-nativesdk \
+    "
diff --git a/meta-sysmocom-bsp/yocto-master/watchdog_5.12.bbappend b/meta-sysmocom-bsp/yocto-master/watchdog_5.13.bbappend
similarity index 100%
rename from meta-sysmocom-bsp/yocto-master/watchdog_5.12.bbappend
rename to meta-sysmocom-bsp/yocto-master/watchdog_5.13.bbappend