diff --git a/meta-sysmocom-bsp/conf/machine/include/sysmobts.inc b/meta-sysmocom-bsp/conf/machine/include/sysmobts.inc
index 94be7ef3d9..4de200d05d 100644
--- a/meta-sysmocom-bsp/conf/machine/include/sysmobts.inc
+++ b/meta-sysmocom-bsp/conf/machine/include/sysmobts.inc
@@ -20,7 +20,7 @@ MACHINE_FEATURES = "kernel26 serial"
 
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "\
 	busybox-ifplugd \
-	${@['watchdog', ''][d.getVar('DISTRO_FEATURES_INITMAN', True) == 'systemd']} \
+	${@['watchdog', ''][d.getVar('VIRTUAL-RUNTIME_init_manager', True) == 'systemd']} \
 	kernel \
 	kernel-module-davinci-wdt \
 	kernel-module-dspdl \
@@ -33,12 +33,10 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "\
 	kernel-module-nls-utf8 \
 	kernel-module-rtfifo "
 
-IMAGE_FSTYPES ?= "tar.bz2 cpio.gz ubifs ubi jffs2"
-
 MACHINE_EXTRA_RDEPENDS = "\
 	task-sysmocom-bts \
 	sysmobts-firmware \
-	${@['watchdog', ''][d.getVar('DISTRO_FEATURES_INITMAN', True) == 'systemd']} \
+	${@['watchdog', ''][d.getVar('VIRTUAL-RUNTIME_init_manager', True) == 'systemd']} \
 	"
 #MACHINE_EXTRA_RRECOMMENDS = "dsplink-module"
 
diff --git a/meta-sysmocom-bsp/conf/machine/sysmobts-v1.conf b/meta-sysmocom-bsp/conf/machine/sysmobts-v1.conf
index 08ebe78897..aa5edb00e3 100644
--- a/meta-sysmocom-bsp/conf/machine/sysmobts-v1.conf
+++ b/meta-sysmocom-bsp/conf/machine/sysmobts-v1.conf
@@ -10,5 +10,6 @@ EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --pagesize=0x800 --
 MKUBIFS_ARGS = "-m 2048 -e 129024 -c 400"
 UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512"
 
+IMAGE_FSTYPES ?= "tar.bz2 jffs2"
 require conf/machine/include/sysmobts.inc
 
diff --git a/meta-sysmocom-bsp/conf/machine/sysmobts-v2.conf b/meta-sysmocom-bsp/conf/machine/sysmobts-v2.conf
index 586a44c5b0..4c35310882 100644
--- a/meta-sysmocom-bsp/conf/machine/sysmobts-v2.conf
+++ b/meta-sysmocom-bsp/conf/machine/sysmobts-v2.conf
@@ -11,4 +11,5 @@ MKUBIFS_ARGS ?= "-m 2048 -e 129024 -c 999"
 UBINIZE_ARGS ?= "-m 2048 -p 128KiB -s 512"
 
 
+IMAGE_FSTYPES ?= "tar.bz2 ubi"
 require conf/machine/include/sysmobts.inc
diff --git a/meta-sysmocom-bsp/recipes-apps/sysmocom-backup/sysmocom-backup_1.0.bb b/meta-sysmocom-bsp/recipes-apps/sysmocom-backup/sysmocom-backup_1.0.bb
index 130fcb67cb..cc02e02b41 100644
--- a/meta-sysmocom-bsp/recipes-apps/sysmocom-backup/sysmocom-backup_1.0.bb
+++ b/meta-sysmocom-bsp/recipes-apps/sysmocom-backup/sysmocom-backup_1.0.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "sysmocom config backup and restore scripts"
 LICENSE = "GPLv3+"
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 PR = "r12"
 
 SRC_URI = "file://sysmocom-backup file://sysmocom-restore"
diff --git a/meta-sysmocom-bsp/recipes-apps/sysmocom-udhcpd-config/files/sysmocom-bsc/udhcpd.conf b/meta-sysmocom-bsp/recipes-apps/sysmocom-udhcpd-config/files/sysmocom-bsc/udhcpd.conf
index d6a9334f8f..e29a77d56f 100644
--- a/meta-sysmocom-bsp/recipes-apps/sysmocom-udhcpd-config/files/sysmocom-bsc/udhcpd.conf
+++ b/meta-sysmocom-bsp/recipes-apps/sysmocom-udhcpd-config/files/sysmocom-bsc/udhcpd.conf
@@ -3,7 +3,7 @@ end   10.23.24.254
 
 interface eth1
 
-option subnet 10.23.24.0
 option router 10.23.24.1
+option subnet 255.255.255.0
 option broadcast 10.23.24.255
 option dns 8.8.8.8
diff --git a/meta-sysmocom-bsp/recipes-apps/sysmocom-udhcpd-config/files/sysmocom-bsc/udhcpd.service b/meta-sysmocom-bsp/recipes-apps/sysmocom-udhcpd-config/files/sysmocom-bsc/udhcpd.service
new file mode 100644
index 0000000000..6b92866e96
--- /dev/null
+++ b/meta-sysmocom-bsp/recipes-apps/sysmocom-udhcpd-config/files/sysmocom-bsc/udhcpd.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=UDHCPD
+
+[Service]
+Type=simple
+ExecStart=/usr/sbin/udhcpd -fS /etc/udhcpd.conf
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta-sysmocom-bsp/recipes-apps/sysmocom-udhcpd-config/sysmocom-udhcpd-config_1.bb b/meta-sysmocom-bsp/recipes-apps/sysmocom-udhcpd-config/sysmocom-udhcpd-config_1.bb
index 2e3425e6de..3e787feb43 100644
--- a/meta-sysmocom-bsp/recipes-apps/sysmocom-udhcpd-config/sysmocom-udhcpd-config_1.bb
+++ b/meta-sysmocom-bsp/recipes-apps/sysmocom-udhcpd-config/sysmocom-udhcpd-config_1.bb
@@ -1,14 +1,20 @@
 DESCRIPTION = "Task for sysmocom external tools"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
+LIC_FILES_CHKSUM = " \
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 
-SRC_URI = "file://udhcpd.conf"
-PR = "r3"
+SRC_URI = "file://udhcpd.conf \
+           file://udhcpd.service \
+          "
+PR = "r5"
 
 CONFFILES_${PN} = "${sysconfdir}/udhcpd.conf"
+FILES_${PN} += "${systemd_unitdir}"
 
 do_install() {
 	install -d ${D}${sysconfdir}
 	install -m 0644 ${WORKDIR}/udhcpd.conf ${D}${sysconfdir}/
+        install -d ${D}${systemd_unitdir}/system/multi-user.target.wants/
+        install -m 0644 /${WORKDIR}/udhcpd.service ${D}${systemd_unitdir}/system/
+        ln -sf ../udhcpd.service ${D}${systemd_unitdir}/system/multi-user.target.wants/
 }
diff --git a/meta-sysmocom-bsp/recipes-apps/tasks/task-gprscore.bb b/meta-sysmocom-bsp/recipes-apps/tasks/task-gprscore.bb
index fd13ae8240..d455fe406d 100644
--- a/meta-sysmocom-bsp/recipes-apps/tasks/task-gprscore.bb
+++ b/meta-sysmocom-bsp/recipes-apps/tasks/task-gprscore.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Task for GPRS core network"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
+LIC_FILES_CHKSUM = " \
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 DEPENDS = "virtual/kernel"
 ALLOW_EMPTY_${PN} = "1"
diff --git a/meta-sysmocom-bsp/recipes-apps/tasks/task-sysmocom-bts.bb b/meta-sysmocom-bsp/recipes-apps/tasks/task-sysmocom-bts.bb
index a3095639a6..73a1d93499 100644
--- a/meta-sysmocom-bsp/recipes-apps/tasks/task-sysmocom-bts.bb
+++ b/meta-sysmocom-bsp/recipes-apps/tasks/task-sysmocom-bts.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Task for sysmoBTS"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
+LIC_FILES_CHKSUM = " \
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 DEPENDS = "virtual/kernel"
 ALLOW_EMPTY_${PN} = "1"
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 c1a7ecd042..274955804a 100644
--- a/meta-sysmocom-bsp/recipes-apps/tasks/task-sysmocom-debug.bb
+++ b/meta-sysmocom-bsp/recipes-apps/tasks/task-sysmocom-debug.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Task for sysmocom development/debugging"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
+LIC_FILES_CHKSUM = " \
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 DEPENDS = "virtual/kernel"
 ALLOW_EMPTY_${PN} = "1"
diff --git a/meta-sysmocom-bsp/recipes-apps/tasks/task-sysmocom-e1.bb b/meta-sysmocom-bsp/recipes-apps/tasks/task-sysmocom-e1.bb
index 998824e56c..f451ed1f07 100644
--- a/meta-sysmocom-bsp/recipes-apps/tasks/task-sysmocom-e1.bb
+++ b/meta-sysmocom-bsp/recipes-apps/tasks/task-sysmocom-e1.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Task for E1 based sysmocom"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
+LIC_FILES_CHKSUM = " \
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 ALLOW_EMPTY_${PN} = "1"
 PR = "r2"
diff --git a/meta-sysmocom-bsp/recipes-apps/tasks/task-sysmocom-feed.bb b/meta-sysmocom-bsp/recipes-apps/tasks/task-sysmocom-feed.bb
index 859dc0e768..978e5d7e58 100644
--- a/meta-sysmocom-bsp/recipes-apps/tasks/task-sysmocom-feed.bb
+++ b/meta-sysmocom-bsp/recipes-apps/tasks/task-sysmocom-feed.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Package to force building everything we want to provide"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
+LIC_FILES_CHKSUM = " \
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 ALLOW_EMPTY_${PN} = "1"
 PR = "r13"
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 7026a7b745..e808390cd4 100644
--- a/meta-sysmocom-bsp/recipes-apps/tasks/task-sysmocom-tools.bb
+++ b/meta-sysmocom-bsp/recipes-apps/tasks/task-sysmocom-tools.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Task for sysmocom external tools"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
+LIC_FILES_CHKSUM = " \
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 ALLOW_EMPTY_${PN} = "1"
 PR = "r7"
diff --git a/meta-sysmocom-bsp/recipes-apps/tasks/task-sysmocom.bb b/meta-sysmocom-bsp/recipes-apps/tasks/task-sysmocom.bb
index 4f79e54f12..21cb55f363 100644
--- a/meta-sysmocom-bsp/recipes-apps/tasks/task-sysmocom.bb
+++ b/meta-sysmocom-bsp/recipes-apps/tasks/task-sysmocom.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Task for sysmocom"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
+LIC_FILES_CHKSUM = " \
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 DEPENDS = "virtual/kernel"
 ALLOW_EMPTY_${PN} = "1"
diff --git a/meta-sysmocom-bsp/recipes-bsp/early-date/early-date_1.bb b/meta-sysmocom-bsp/recipes-bsp/early-date/early-date_1.bb
index a1b22d8ab5..831e73e710 100644
--- a/meta-sysmocom-bsp/recipes-bsp/early-date/early-date_1.bb
+++ b/meta-sysmocom-bsp/recipes-bsp/early-date/early-date_1.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Set an early date on RTC less systems"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 
 SRC_URI = "\
 	file://early-date \
diff --git a/meta-sysmocom-bsp/recipes-bsp/netbase/netbase/sysmocom-odu/interfaces b/meta-sysmocom-bsp/recipes-bsp/netbase/netbase/sysmocom-odu/interfaces
index d37e3ff897..d1b9f45f3f 100644
--- a/meta-sysmocom-bsp/recipes-bsp/netbase/netbase/sysmocom-odu/interfaces
+++ b/meta-sysmocom-bsp/recipes-bsp/netbase/netbase/sysmocom-odu/interfaces
@@ -1,6 +1,6 @@
 # /etc/network/interfaces -- configuration file for ifup(8), ifdown(8)
  
-auto lo eth0 eth1
+auto lo eth0
 
 # The loopback interface
 iface lo inet loopback
@@ -8,9 +8,3 @@ iface lo inet loopback
 # eth0
 iface eth0 inet dhcp
 
-# eth1
-iface eth1 inet static
-        address 192.168.4.11
-        netmask 255.255.255.0
-
-
diff --git a/meta-sysmocom-bsp/recipes-bsp/netbase/netbase_sysmocom.inc b/meta-sysmocom-bsp/recipes-bsp/netbase/netbase_sysmocom.inc
index bd2aa4bb68..100ccb7252 100644
--- a/meta-sysmocom-bsp/recipes-bsp/netbase/netbase_sysmocom.inc
+++ b/meta-sysmocom-bsp/recipes-bsp/netbase/netbase_sysmocom.inc
@@ -1,6 +1,6 @@
 SYSMOCOM := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
 FILESEXTRAPATHS_prepend := "${SYSMOCOM}/${PN}-${PV}:${SYSMOCOM}/${PN}:"
-PRINC = "18"
+PRINC = "19"
 
 
 # bug in poky meta/classes/base.bbclass
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 df053bc065..2d468e7898 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
@@ -2,7 +2,7 @@ DESCRIPTION = "OpenGGSN GPRS routing to the real world"
 RDEPENDS_${PN} = "iptables kernel-module-ipt-masquerade"
 
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 
 SRC_URI = "file://gprs_routing"
 
diff --git a/meta-sysmocom-bsp/recipes-config/openggsn-config/sysmocom-ggsn-config_0.1.bb b/meta-sysmocom-bsp/recipes-config/openggsn-config/sysmocom-ggsn-config_0.1.bb
index 637719cf3e..8996ce88fe 100644
--- a/meta-sysmocom-bsp/recipes-config/openggsn-config/sysmocom-ggsn-config_0.1.bb
+++ b/meta-sysmocom-bsp/recipes-config/openggsn-config/sysmocom-ggsn-config_0.1.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "OpenGGSN config by sysmocom"
 SRC_URI = "file://ggsn.conf"
 LICENSE = "closed"
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 
 do_install() {
 	install -d ${D}${sysconfdir}
diff --git a/meta-sysmocom-bsp/recipes-config/sysmocom-openvpn-config/sysmocom-openvpn-config_1.bb b/meta-sysmocom-bsp/recipes-config/sysmocom-openvpn-config/sysmocom-openvpn-config_1.bb
index 733d99b797..3673b68b49 100644
--- a/meta-sysmocom-bsp/recipes-config/sysmocom-openvpn-config/sysmocom-openvpn-config_1.bb
+++ b/meta-sysmocom-bsp/recipes-config/sysmocom-openvpn-config/sysmocom-openvpn-config_1.bb
@@ -2,7 +2,7 @@ HOMEPAGE = "http://www.sysmocom.de"
 RDEPENDS_${PN} = "openvpn"
 
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 
 SRC_URI = "file://sysmocom-vpn.conf"
 PR = "r3"
diff --git a/meta-sysmocom-bsp/recipes-core/busybox/busybox_sysmocom_1.21.1.inc b/meta-sysmocom-bsp/recipes-core/busybox/busybox_sysmocom_1.21.1.inc
new file mode 100644
index 0000000000..130fab6976
--- /dev/null
+++ b/meta-sysmocom-bsp/recipes-core/busybox/busybox_sysmocom_1.21.1.inc
@@ -0,0 +1,2 @@
+SRC_URI += "file://ifplugd-use-a-larger-netlink-buffer.patch"
+PRINC := "${@int(PRINC) + 1}"
diff --git a/meta-sysmocom-bsp/recipes-core/busybox/busybox_sysmocom_systemd.inc b/meta-sysmocom-bsp/recipes-core/busybox/busybox_sysmocom_systemd.inc
index 19739f5a15..58b268226b 100644
--- a/meta-sysmocom-bsp/recipes-core/busybox/busybox_sysmocom_systemd.inc
+++ b/meta-sysmocom-bsp/recipes-core/busybox/busybox_sysmocom_systemd.inc
@@ -2,5 +2,3 @@
 SYSMOCOM_D := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
 FILESEXTRAPATHS_prepend := "${SYSMOCOM}/${PN}-systemd:${SYSMOCOM_D}/${PN}:"
 PRINC := "${@int(PRINC) + 3}"
-
-SRC_URI += "file://ifplugd-use-a-larger-netlink-buffer.patch"
diff --git a/meta-sysmocom-bsp/recipes-extra/ca-certificates/ca-cacert-rootcert.bb b/meta-sysmocom-bsp/recipes-extra/ca-certificates/ca-cacert-rootcert.bb
index 8793c81ea0..271b43c296 100644
--- a/meta-sysmocom-bsp/recipes-extra/ca-certificates/ca-cacert-rootcert.bb
+++ b/meta-sysmocom-bsp/recipes-extra/ca-certificates/ca-cacert-rootcert.bb
@@ -2,7 +2,7 @@ CRIPTION = "CACert Root and Class3 PKI"
 HOMEPAGE = "http://www.cacert.org/index.php?id=3"
 SECTION = "misc"
 LICENSE = "RDL-COD14"
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 PR = "r6"
 
 SRC_URI = "file://root.crt file://class3.crt"
diff --git a/meta-sysmocom-bsp/recipes-extra/tcpdump/tcpdump-4.1.1/0001-minimal-IEEE802.15.4-allowed.patch b/meta-sysmocom-bsp/recipes-extra/tcpdump/tcpdump-4.1.1/0001-minimal-IEEE802.15.4-allowed.patch
deleted file mode 100644
index 9d3d60d4d7..0000000000
--- a/meta-sysmocom-bsp/recipes-extra/tcpdump/tcpdump-4.1.1/0001-minimal-IEEE802.15.4-allowed.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Sergey Lapin <slapin@slind.org>
-Date: Wed, 28 Jan 2009 16:34:15 +0300
-Subject: [PATCH] minimal IEEE802.15.4 allowed
-
----
- tcpdump.c |    3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-diff --git a/tcpdump.c b/tcpdump.c
-index 06683af..fbc944c 100644
---- a/tcpdump.c
-+++ b/tcpdump.c
-@@ -282,6 +282,9 @@ static struct printer printers[] = {
- #ifdef DLT_MFR
- 	{ mfr_if_print,		DLT_MFR },
- #endif
-+#ifdef DLT_IEEE802_15_4
-+	{ raw_if_print, DLT_IEEE802_15_4 },
-+#endif
- #if defined(DLT_BLUETOOTH_HCI_H4_WITH_PHDR) && defined(HAVE_PCAP_BLUETOOTH_H)
- 	{ bt_if_print,		DLT_BLUETOOTH_HCI_H4_WITH_PHDR},
- #endif
diff --git a/meta-sysmocom-bsp/recipes-extra/tcpdump/tcpdump-4.1.1/ipv6-cross.patch b/meta-sysmocom-bsp/recipes-extra/tcpdump/tcpdump-4.1.1/ipv6-cross.patch
deleted file mode 100644
index 7eba2c5a6d..0000000000
--- a/meta-sysmocom-bsp/recipes-extra/tcpdump/tcpdump-4.1.1/ipv6-cross.patch
+++ /dev/null
@@ -1,41 +0,0 @@
----
- configure.in |   12 ++++++++----
- 1 files changed, 8 insertions(+), 4 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index eb3e5e8..11257c9 100644
---- a/configure.in
-+++ b/configure.in
-@@ -181,8 +181,9 @@ yes)   AC_MSG_RESULT(yes)
-        ipv6=no
-        ;;
-   esac ],
--
--  AC_TRY_RUN([ /* AF_INET6 available check */
-+[
-+  if test x"$cross_compiling" != "xyes"; then
-+    AC_TRY_RUN([ /* AF_INET6 avalable check */
- #include <sys/types.h>
- #include <sys/socket.h>
- main()
-@@ -201,7 +202,10 @@ main()
-   ipv6=no],
- [ AC_MSG_RESULT(no)
-   ipv6=no]
--))
-+  )
-+else
-+  AC_MSG_FAILURE([Unable to check for ipv6 when crosscompiling, please specify.])
-+fi])
- 
- ipv6type=unknown
- ipv6lib=none
-@@ -316,7 +320,7 @@ if test "$ipv6" = "yes" -a "$ipv6lib" != "none"; then
- fi
- 
- 
--if test "$ipv6" = "yes"; then
-+if test x"$cross_compiling" != "xyes" -a "$ipv6" = "yes"; then
- 	#
- 	# XXX - on Tru64 UNIX 5.1, there is no "getaddrinfo()"
- 	# function in libc; there are "ngetaddrinfo()" and
diff --git a/meta-sysmocom-bsp/recipes-extra/tcpdump/tcpdump-4.1.1/tcpdump_configure_no_-O2.patch b/meta-sysmocom-bsp/recipes-extra/tcpdump/tcpdump-4.1.1/tcpdump_configure_no_-O2.patch
deleted file mode 100644
index 7929da5b1f..0000000000
--- a/meta-sysmocom-bsp/recipes-extra/tcpdump/tcpdump-4.1.1/tcpdump_configure_no_-O2.patch
+++ /dev/null
@@ -1,42 +0,0 @@
----
- configure |    8 ++++----
- 1 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/configure b/configure
-index cb51d19..73d51af 100755
---- a/configure
-+++ b/configure
-@@ -2691,13 +2691,13 @@ if test "$ac_test_CFLAGS" = set; then
-   CFLAGS=$ac_save_CFLAGS
- elif test $ac_cv_prog_cc_g = yes; then
-   if test "$GCC" = yes; then
--    CFLAGS="-g -O2"
-+    CFLAGS="-g"
-   else
-     CFLAGS="-g"
-   fi
- else
-   if test "$GCC" = yes; then
--    CFLAGS="-O2"
-+    CFLAGS=""
-   else
-     CFLAGS=
-   fi
-@@ -2830,7 +2830,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
-     if test "$GCC" = yes ; then
- 	    if test "$SHLICC2" = yes ; then
- 		    ac_cv_lbl_gcc_vers=2
--		    V_CCOPT="-O2"
-+		    V_CCOPT=""
- 	    else
- 		    { echo "$as_me:$LINENO: checking gcc version" >&5
- echo $ECHO_N "checking gcc version... $ECHO_C" >&6; }
-@@ -2847,7 +2847,7 @@ fi
- 		    { echo "$as_me:$LINENO: result: $ac_cv_lbl_gcc_vers" >&5
- echo "${ECHO_T}$ac_cv_lbl_gcc_vers" >&6; }
- 		    if test $ac_cv_lbl_gcc_vers -gt 1 ; then
--			    V_CCOPT="-O2"
-+			    V_CCOPT=""
- 		    fi
- 	    fi
-     else
diff --git a/meta-sysmocom-bsp/recipes-extra/tcpdump/tcpdump-4.6.1/add-ptest.patch b/meta-sysmocom-bsp/recipes-extra/tcpdump/tcpdump-4.6.1/add-ptest.patch
new file mode 100644
index 0000000000..358f6050f6
--- /dev/null
+++ b/meta-sysmocom-bsp/recipes-extra/tcpdump/tcpdump-4.6.1/add-ptest.patch
@@ -0,0 +1,38 @@
+From 7b259580800e259d232229dc89f97058b56e2fe8 Mon Sep 17 00:00:00 2001
+From: "Hongjun.Yang" <hongjun.yang@windriver.com>
+Date: Wed, 22 Oct 2014 10:02:48 +0800
+Subject: [PATCH] Add ptest for tcpdump
+
+Upstream-Status: Pending
+
+Signed-off-by: Hongjun.Yang <hongjun.yang@windriver.com>
+---
+ Makefile.in | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 8c35a45..4fb8ae6 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -428,9 +428,17 @@ distclean:
+ 	    tests/failure-outputs.txt
+ 	rm -rf autom4te.cache tests/DIFF tests/NEW
+ 
+-check: tcpdump
++buildtest-TESTS: tcpdump
++
++runtest-PTEST:
+ 	(cd tests && ./TESTrun.sh)
+ 
++install-ptest:
++	cp -r tests			$(DESTDIR) 
++	cp -r config.h			$(DESTDIR)
++	install -m 0755 Makefile 	$(DESTDIR)
++	ln -sf /usr/sbin/tcpdump	$(DESTDIR)/tcpdump
++
+ tags: $(TAGFILES)
+ 	ctags -wtd $(TAGFILES)
+ 
+-- 
+1.9.1
+
diff --git a/meta-sysmocom-bsp/recipes-extra/tcpdump/tcpdump-4.1.1/configure.patch b/meta-sysmocom-bsp/recipes-extra/tcpdump/tcpdump-4.6.1/configure.patch
similarity index 100%
rename from meta-sysmocom-bsp/recipes-extra/tcpdump/tcpdump-4.1.1/configure.patch
rename to meta-sysmocom-bsp/recipes-extra/tcpdump/tcpdump-4.6.1/configure.patch
diff --git a/meta-sysmocom-bsp/recipes-extra/tcpdump/tcpdump-4.6.1/run-ptest b/meta-sysmocom-bsp/recipes-extra/tcpdump/tcpdump-4.6.1/run-ptest
new file mode 100644
index 0000000000..c03a8b8ef3
--- /dev/null
+++ b/meta-sysmocom-bsp/recipes-extra/tcpdump/tcpdump-4.6.1/run-ptest
@@ -0,0 +1,5 @@
+#!/bin/sh
+make -k runtest-PTEST | sed -e '/: passed/ s/^/PASS: /g' \
+			-e '/: failed/ s/^/FAIL: /g' \
+			-e 's/: passed//g' \
+			-e 's/: failed//g'
diff --git a/meta-sysmocom-bsp/recipes-extra/tcpdump/tcpdump-4.6.1/tcpdump-configure-dlpi.patch b/meta-sysmocom-bsp/recipes-extra/tcpdump/tcpdump-4.6.1/tcpdump-configure-dlpi.patch
new file mode 100644
index 0000000000..50e2d54399
--- /dev/null
+++ b/meta-sysmocom-bsp/recipes-extra/tcpdump/tcpdump-4.6.1/tcpdump-configure-dlpi.patch
@@ -0,0 +1,31 @@
+[PATCH] tcpdump: cross-compiling not check dlpi.
+
+For cross-compiling on Linux platforms, we do not need to check libdlpi 
+since it is only placed on Solaris.
+Also, checking libdlpi in native /lib would cause do_qa_configure fail.
+
+Upstream-Status: Pending.
+
+Signed-off-by: Xin Ouyang <Xin.Ouyang@windriver.com>
+---
+ configure.in |    4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 7f9591c..ca277c0 100644
+--- a/configure.in
++++ b/configure.in
+@@ -716,7 +716,9 @@ don't.])
+ fi
+ 
+ # libdlpi is needed for Solaris 11 and later.
+-AC_CHECK_LIB(dlpi, dlpi_walk, LIBS="$LIBS -ldlpi" LDFLAGS="-L/lib $LDFLAGS", ,-L/lib)
++if test "$cross_compiling" != yes; then
++	AC_CHECK_LIB(dlpi, dlpi_walk, LIBS="$LIBS -ldlpi" LDFLAGS="-L/lib $LDFLAGS", ,-L/lib)
++fi
+ 
+ dnl portability macros for getaddrinfo/getnameinfo
+ dnl
+-- 
+1.7.5.4
+
diff --git a/meta-sysmocom-bsp/recipes-extra/tcpdump/tcpdump-4.6.1/tcpdump-cross-getaddrinfo.patch b/meta-sysmocom-bsp/recipes-extra/tcpdump/tcpdump-4.6.1/tcpdump-cross-getaddrinfo.patch
new file mode 100644
index 0000000000..b414b72e9d
--- /dev/null
+++ b/meta-sysmocom-bsp/recipes-extra/tcpdump/tcpdump-4.6.1/tcpdump-cross-getaddrinfo.patch
@@ -0,0 +1,23 @@
+Fix getaddinfo check when cross compiling
+
+Upstream-Status: Pending.
+
+AC_TRY_RUN defaults to td_cv_buggygetaddrinfo=yes when
+cross-compiling. So this change indicates that we
+are cross-compiling.
+
+Signed-of-by: Aws Ismail <aws.ismail@windriver.com>
+
+diff --git a/configure.in b/configure.in
+index ca277c0..283035e 100644
+--- a/configure.in
++++ b/configure.in
+@@ -434,7 +434,7 @@ main()
+ ],
+ 	td_cv_buggygetaddrinfo=no,
+ 	td_cv_buggygetaddrinfo=yes,
+-	td_cv_buggygetaddrinfo=yes)])
++	td_cv_buggygetaddrinfo=cross)])
+ 	if test "$td_cv_buggygetaddrinfo" = no; then
+ 		AC_MSG_RESULT(good)
+ 	else
diff --git a/meta-sysmocom-bsp/recipes-extra/tcpdump/tcpdump-4.6.1/unnecessary-to-check-libpcap.patch b/meta-sysmocom-bsp/recipes-extra/tcpdump/tcpdump-4.6.1/unnecessary-to-check-libpcap.patch
new file mode 100644
index 0000000000..d7a3ac23b1
--- /dev/null
+++ b/meta-sysmocom-bsp/recipes-extra/tcpdump/tcpdump-4.6.1/unnecessary-to-check-libpcap.patch
@@ -0,0 +1,33 @@
+unnecessary to check libpcap
+
+Upstream-Status: Pending
+
+since the check of libpcap did not consider the cross-compile, lead to the
+below error:
+	This autoconf log indicates errors, it looked at host include and/or
+	library paths while determining system capabilities.
+
+In fact, the libpcap has been added into the tcpdump's DEPENDS, not need to
+check if libpcap existed.
+
+Signed-off-by: Roy Li <rongqing.li@windriver.com>
+---
+ configure.in |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.in b/configure.in
+index 06fade1..9125de7 100644
+--- a/configure.in
++++ b/configure.in
+@@ -567,7 +567,7 @@ AC_SEARCH_LIBS(getrpcbynumber, nsl,
+ dnl AC_CHECK_LIB(z, uncompress)
+ dnl AC_CHECK_HEADERS(zlib.h)
+ 
+-AC_LBL_LIBPCAP(V_PCAPDEP, V_INCLS)
++#AC_LBL_LIBPCAP(V_PCAPDEP, V_INCLS)
+ 
+ #
+ # Check for these after AC_LBL_LIBPCAP, so we link with the appropriate
+-- 
+1.7.9.5
+
diff --git a/meta-sysmocom-bsp/recipes-extra/tcpdump/tcpdump_4.1.1.bb b/meta-sysmocom-bsp/recipes-extra/tcpdump/tcpdump_4.1.1.bb
deleted file mode 100644
index 9fd0ac04bf..0000000000
--- a/meta-sysmocom-bsp/recipes-extra/tcpdump/tcpdump_4.1.1.bb
+++ /dev/null
@@ -1,41 +0,0 @@
-DESCRIPTION = "A sophisticated network protocol analyzer"
-HOMEPAGE = "http://www.tcpdump.org/"
-LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=1d4b0366557951c84a94fabe3529f867"
-SECTION = "console/network"
-DEPENDS = "libpcap"
-PR = "r1"
-
-SRC_URI = " \
-	http://www.tcpdump.org/release/tcpdump-${PV}.tar.gz \
-	file://tcpdump_configure_no_-O2.patch \
-	file://0001-minimal-IEEE802.15.4-allowed.patch \
-	file://ipv6-cross.patch \
-	file://configure.patch \
-"
-
-inherit autotools
-# ac_cv_linux_vers=${ac_cv_linux_vers=2}
-
-EXTRA_OECONF = "--without-crypto \
-		${@base_contains('DISTRO_FEATURES', 'ipv6', '--enable-ipv6', '--disable-ipv6', d)}"
-
-do_configure() {
-	# AC_CHECK_LIB(dlpi.. was looking to host /lib
-	sed -i 's:-L/lib:-L${STAGING_LIBDIR}:g' ./configure.in
-        
-	gnu-configize
-	autoconf
-	oe_runconf
-	sed -i 's:/usr/lib:${STAGING_LIBDIR}:' ./Makefile
-	sed -i 's:/usr/include:${STAGING_INCDIR}:' ./Makefile
-}
-
-do_install_append() {
-	# tcpdump 4.0.0 installs a copy to /usr/sbin/tcpdump.4.0.0
-	rm -f ${D}${sbindir}/tcpdump.${PV}
-}
-
-SRC_URI[md5sum] = "d0dd58bbd6cd36795e05c6f1f74420b0"
-SRC_URI[sha256sum] = "e6cd4bbd61ec7adbb61ba8352c4b4734f67b8caaa845d88cb826bc0b9f1e7f0a"
-
diff --git a/meta-sysmocom-bsp/recipes-extra/tcpdump/tcpdump_4.6.1.bb b/meta-sysmocom-bsp/recipes-extra/tcpdump/tcpdump_4.6.1.bb
new file mode 100644
index 0000000000..8065a37d91
--- /dev/null
+++ b/meta-sysmocom-bsp/recipes-extra/tcpdump/tcpdump_4.6.1.bb
@@ -0,0 +1,52 @@
+SUMMARY = "A sophisticated network protocol analyzer"
+HOMEPAGE = "http://www.tcpdump.org/"
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=1d4b0366557951c84a94fabe3529f867"
+SECTION = "console/network"
+DEPENDS = "libpcap"
+
+SRC_URI = " \
+    http://www.tcpdump.org/release/${BP}.tar.gz \
+    file://configure.patch \
+    file://unnecessary-to-check-libpcap.patch \
+    file://tcpdump-configure-dlpi.patch \
+    file://tcpdump-cross-getaddrinfo.patch \
+    file://add-ptest.patch \
+    file://run-ptest \
+"
+SRC_URI[md5sum] = "dab267ec30216a069747d10314079ec7"
+SRC_URI[sha256sum] = "4c88c2a9aeb4047074f344fc9b2b6577b219972d359e192f6d12ccf983a13fd7"
+export LIBS=" -lpcap"
+
+inherit autotools ptest
+B = "${S}"
+CACHED_CONFIGUREVARS = "ac_cv_linux_vers=${ac_cv_linux_vers=2}"
+
+PACKAGECONFIG ??= "openssl ipv6"
+PACKAGECONFIG[openssl] = "--with-crypto=yes, --without-openssl --without-crypto, openssl"
+PACKAGECONFIG[ipv6] = "--enable-ipv6, --disable-ipv6,"
+
+EXTRA_AUTORECONF += " -I m4"
+
+do_configure_prepend() {
+    mkdir -p ${S}/m4
+    if [ -f aclocal.m4 ]; then
+        mv aclocal.m4 ${S}/m4
+    fi
+    # AC_CHECK_LIB(dlpi.. was looking to host /lib
+    sed -i 's:-L/lib::g' ./configure.in
+}
+do_configure_append() {
+    sed -i 's:-L/usr/lib::' ./Makefile
+    sed -i 's:-Wl,-rpath,${STAGING_LIBDIR}::' ./Makefile
+    sed -i 's:-I/usr/include::' ./Makefile
+}
+
+do_install_append() {
+    # tcpdump 4.0.0 installs a copy to /usr/sbin/tcpdump.4.0.0
+    rm -f ${D}${sbindir}/tcpdump.${PV}
+}
+
+do_compile_ptest() {
+	oe_runmake buildtest-TESTS
+}
diff --git a/meta-sysmocom-bsp/recipes-fixes/systemd/systemd-compat-units_dora.inc b/meta-sysmocom-bsp/recipes-fixes/systemd/systemd-compat-units_dora.inc
new file mode 100644
index 0000000000..9cc0c9e635
--- /dev/null
+++ b/meta-sysmocom-bsp/recipes-fixes/systemd/systemd-compat-units_dora.inc
@@ -0,0 +1,6 @@
+# In dora a SRC_URI = "file://*.service" is done and that doesn't work
+# when playing with the FILESPATH
+SRC_URI = "\
+	file://machineid.service \
+	file://run-postinsts.service \
+	"
diff --git a/meta-sysmocom-bsp/recipes-fixes/systemd/systemd-compat-units_sysmocom.inc b/meta-sysmocom-bsp/recipes-fixes/systemd/systemd-compat-units_sysmocom.inc
index b8e86feb29..3f4a08a714 100644
--- a/meta-sysmocom-bsp/recipes-fixes/systemd/systemd-compat-units_sysmocom.inc
+++ b/meta-sysmocom-bsp/recipes-fixes/systemd/systemd-compat-units_sysmocom.inc
@@ -5,11 +5,8 @@ SYSTEMD_DISABLED_SYSV_SERVICES_remove = "networking"
 
 S_THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
 FILESPATH =. "${@base_set_filespath(["${S_THISDIR}/${PN}"], d)}:"
-SRC_URI = "\
-	file://machineid.service \
-	file://run-postinsts.service \
-	file://alignment.service"
 
+SRC_URI += "file://alignment.service"
 
 do_install_append() {
 	install -d ${D}${systemd_unitdir}/system/basic.target.wants
@@ -19,3 +16,5 @@ do_install_append() {
 	ln -sf ../alignment.service ${D}${systemd_unitdir}/system/basic.target.wants/
 	ln -sf ../alignment.service ${D}${systemd_unitdir}/system/sysinit.target.wants/
 }
+
+FILES_${PN} = "${systemd_unitdir}/system ${bindir}"
diff --git a/meta-sysmocom-bsp/recipes-fixes/systemd/systemd_sysmocom-206.inc b/meta-sysmocom-bsp/recipes-fixes/systemd/systemd_sysmocom-206.inc
new file mode 100644
index 0000000000..c60cb95e91
--- /dev/null
+++ b/meta-sysmocom-bsp/recipes-fixes/systemd/systemd_sysmocom-206.inc
@@ -0,0 +1,3 @@
+SRC_URI += " \
+            file://0001-RFC-fsck-Allow-to-specify-the-fsck-repair-option-in-.patch \
+	"
diff --git a/meta-sysmocom-bsp/recipes-fixes/systemd/systemd_sysmocom.inc b/meta-sysmocom-bsp/recipes-fixes/systemd/systemd_sysmocom.inc
index 817a60f3f5..ba573c7839 100644
--- a/meta-sysmocom-bsp/recipes-fixes/systemd/systemd_sysmocom.inc
+++ b/meta-sysmocom-bsp/recipes-fixes/systemd/systemd_sysmocom.inc
@@ -1,11 +1,10 @@
 S_THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
 FILESPATH =. "${@base_set_filespath(["${S_THISDIR}/${PN}"], d)}:"
 
-PRINC="23"
+PRINC="24"
 
 SRC_URI += "file://journald.conf \
             file://0001-Feature-switch-ListenDatagram-from-run-systemd-journ.patch \
-            file://0001-RFC-fsck-Allow-to-specify-the-fsck-repair-option-in-.patch \
            "
 
 SRC_URI_append_sysmobts-v1 = " file://system.conf"
diff --git a/meta-sysmocom-bsp/recipes-sysmobts/firmware/sysmobts-firmware_3.11.bb b/meta-sysmocom-bsp/recipes-sysmobts/firmware/sysmobts-firmware_3.11.bb
index 5ee257df75..aab425a27b 100644
--- a/meta-sysmocom-bsp/recipes-sysmobts/firmware/sysmobts-firmware_3.11.bb
+++ b/meta-sysmocom-bsp/recipes-sysmobts/firmware/sysmobts-firmware_3.11.bb
@@ -3,6 +3,9 @@ PACKAGE_ARCH = "sysmobts-v2"
 FIRMWARE-VERSION = "superfemto_v${PV}"
 PR = "r1.${INC_PR}"
 
+SRC_URI[md5sum] = "69993545decb8bdf39fa4dd9e5103ef9"
+SRC_URI[sha256sum] = "8b2b19475a298299ef2de1061940ac690c447fa7b5d22b4fdb9dfd62bdc3c4a8"
+
 require ${PN}.inc
 
 do_install() {
diff --git a/meta-sysmocom-bsp/recipes-sysmobts/sbts2050-util/sbts2050-util_2.3.bb b/meta-sysmocom-bsp/recipes-sysmobts/sbts2050-util/sbts2050-util_2.3.bb
index d5d7d255e0..fcc3de0646 100644
--- a/meta-sysmocom-bsp/recipes-sysmobts/sbts2050-util/sbts2050-util_2.3.bb
+++ b/meta-sysmocom-bsp/recipes-sysmobts/sbts2050-util/sbts2050-util_2.3.bb
@@ -1,6 +1,9 @@
 FIRMWARE-VERSION = "${PV}"
 PR = "r2.${INC_PR}"
 
+SRC_URI[md5sum] = "c7b75b5ebc5bb1185afd2880444b10dd"
+SRC_URI[sha256sum] = "c1e9817a4f7163396ee00577877bcb61bab9fbb252947ea05a43ea872d53d515"
+
 require ${PN}.inc
 
 do_install() {
diff --git a/meta-sysmocom-bsp/recipes-sysmobts/ubl/ubl_git.bb b/meta-sysmocom-bsp/recipes-sysmobts/ubl/ubl_git.bb
index 7163d481f1..a876323a24 100644
--- a/meta-sysmocom-bsp/recipes-sysmobts/ubl/ubl_git.bb
+++ b/meta-sysmocom-bsp/recipes-sysmobts/ubl/ubl_git.bb
@@ -27,7 +27,7 @@ do_compile() {
 	unset LDFLAGS
 	unset CFLAGS
 	unset CPPFLAGS
-	oe_runmake BOARD=${BOARD_NAME}
+	oe_runmake BOARD=${BOARD_NAME} CC="$CC"
 }
 
 do_deploy() {
diff --git a/meta-sysmocom-bsp/yocto-dora/busybox_1.21.1.bbappend b/meta-sysmocom-bsp/yocto-dora/busybox_1.21.1.bbappend
index 641aeb3c75..0c0790f242 100644
--- a/meta-sysmocom-bsp/yocto-dora/busybox_1.21.1.bbappend
+++ b/meta-sysmocom-bsp/yocto-dora/busybox_1.21.1.bbappend
@@ -2,3 +2,4 @@
 SYSMOCOM_ORIG_PV := "${PV}"
 require recipes-core/busybox/${PN}_sysmocom.inc
 require recipes-core/busybox/${PN}_sysmocom_systemd.inc
+require recipes-core/busybox/${PN}_sysmocom_1.21.1.inc
diff --git a/meta-sysmocom-bsp/yocto-dora/systemd-compat-units.bbappend b/meta-sysmocom-bsp/yocto-dora/systemd-compat-units.bbappend
index d76e8d1973..b2b70a8392 100644
--- a/meta-sysmocom-bsp/yocto-dora/systemd-compat-units.bbappend
+++ b/meta-sysmocom-bsp/yocto-dora/systemd-compat-units.bbappend
@@ -1,2 +1,3 @@
+require recipes-fixes/systemd/${PN}_dora.inc
 require recipes-fixes/systemd/${PN}_sysmocom.inc
 
diff --git a/meta-sysmocom-bsp/yocto-dora/systemd_206.bbappend b/meta-sysmocom-bsp/yocto-dora/systemd_206.bbappend
index 9e035919af..b5369a77c6 100644
--- a/meta-sysmocom-bsp/yocto-dora/systemd_206.bbappend
+++ b/meta-sysmocom-bsp/yocto-dora/systemd_206.bbappend
@@ -1 +1,2 @@
+require recipes-fixes/${PN}/${PN}_sysmocom-${PV}.inc
 require recipes-fixes/${PN}/${PN}_sysmocom.inc