diff --git a/meta-sysmocom-bsp/conf/distro/include/sysmocom-defaults.conf b/meta-sysmocom-bsp/conf/distro/include/sysmocom-defaults.conf
index 37140106a2..5d5d2d4dc4 100644
--- a/meta-sysmocom-bsp/conf/distro/include/sysmocom-defaults.conf
+++ b/meta-sysmocom-bsp/conf/distro/include/sysmocom-defaults.conf
@@ -30,8 +30,8 @@ USE_NLS = "no"
 # We don't need x11, nfc, selinux, pam in our builds
 DISTRO_FEATURES_remove = "x11 nfc selinux pam"
 
-# Get rid off XZ for systemd
-PACKAGECONFIG_pn-systemd = "ldconfig"
+# Get rid off XZ, xkbcommon, pam, selinux for systemd and many more now
+PACKAGECONFIG_pn-systemd = "compat ldconfig binfmt sysusers randomseed myhostname firstboot utmp"
 
 # From fido on.. build curl with libssl to avoid gnutls
 PACKAGECONFIG_pn-curl="ipv6 ssl zlib"
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 baffbc00f6..1838b629fe 100644
--- a/meta-sysmocom-bsp/recipes-apps/tasks/task-sysmocom-feed.bb
+++ b/meta-sysmocom-bsp/recipes-apps/tasks/task-sysmocom-feed.bb
@@ -3,7 +3,7 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = " \
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 ALLOW_EMPTY_${PN} = "1"
-PR = "r20"
+PR = "r21"
 
 RDEPENDS_${PN} = "\
 	task-sysmocom-tools \
@@ -16,4 +16,4 @@ RDEPENDS_${PN} = "\
 	logrotate python-jsonrpclib python-enum iputils \
 	packagegroup-sysmobts-sob rtl8169-eeprom autossh \
 	perl libdbd-sqlite-perl libdbi-perl libjson-perl \
-	netcat-openbsd perf"
+	netcat-openbsd perf lksctp-tools"
diff --git a/meta-sysmocom-bsp/recipes-bsp/ntp/ntp_4.2.8p1.bb b/meta-sysmocom-bsp/recipes-bsp/ntp/ntp_4.2.8p6.bb
similarity index 96%
rename from meta-sysmocom-bsp/recipes-bsp/ntp/ntp_4.2.8p1.bb
rename to meta-sysmocom-bsp/recipes-bsp/ntp/ntp_4.2.8p6.bb
index be5f6d9817..0bd7b62041 100644
--- a/meta-sysmocom-bsp/recipes-bsp/ntp/ntp_4.2.8p1.bb
+++ b/meta-sysmocom-bsp/recipes-bsp/ntp/ntp_4.2.8p6.bb
@@ -27,8 +27,8 @@ SRC_URI = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-${PV}.tar.g
 
 PR = "r9"
 
-SRC_URI[md5sum] = "65d8cdfae4722226fbe29863477641ed"
-SRC_URI[sha256sum] = "948274b88f1ed002d867ced6aaefdfd0999668b11285ac2b3a67ff2629d59d88"
+SRC_URI[md5sum] = "60049f51e9c8305afe30eb22b711c5c6"
+SRC_URI[sha256sum] = "583d0e1c573ace30a9c6afbea0fc52cae9c8c916dbc15c026e485a0dda4ba048"
 
 inherit autotools update-rc.d useradd systemd pkgconfig
 
@@ -101,6 +101,10 @@ do_install_append() {
 
     install -d ${D}${systemd_unitdir}/ntp-units.d
     install -m 0644 ${WORKDIR}/ntpd.list ${D}${systemd_unitdir}/ntp-units.d/60-ntpd.list
+
+    if [ `ls -A ${D}${libexecdir} | wc -l` -eq 0 ]; then
+        rm -rf ${D}${libexecdir}
+    fi
 }
 
 PACKAGES += "ntpdate sntp ${PN}-tickadj ${PN}-utils ${PN}-perl"
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 1ca94340d9..d191e7c022 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
@@ -7,7 +7,7 @@ PR = "r5"
 DEPENDS = "bison-native flex-native"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-SRC_URI = "https://downloads.openwrt.org/sources/lm_sensors-${PV}.tar.bz2"
+SRC_URI = "http://pkgs.fedoraproject.org/repo/pkgs/lm_sensors/lm_sensors-${PV}.tar.bz2/829d88fb09d67723fbf42853eb84d1fd/lm_sensors-${PV}.tar.bz2"
 
 SRC_URI[md5sum] = "829d88fb09d67723fbf42853eb84d1fd"
 SRC_URI[sha256sum] = "bde7e1d8b473bca6528694b696668c4cd0a28515aef36b961e4f7d8a6b47e581"
diff --git a/meta-sysmocom-bsp/recipes-fixes/iproute2/files/iproute2-4.3.0/disable_arpd_in_misc.patch b/meta-sysmocom-bsp/recipes-fixes/iproute2/files/iproute2-4.3.0/disable_arpd_in_misc.patch
deleted file mode 100644
index 8f2ea781a9..0000000000
--- a/meta-sysmocom-bsp/recipes-fixes/iproute2/files/iproute2-4.3.0/disable_arpd_in_misc.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: iproute2-4.3.0/misc/Makefile
-===================================================================
---- iproute2-4.3.0.orig/misc/Makefile	2015-12-03 17:17:49.164492802 +0100
-+++ iproute2-4.3.0/misc/Makefile	2015-12-03 17:18:39.368493469 +0100
-@@ -5,9 +5,9 @@
- 
- include ../Config
- 
--ifeq ($(HAVE_BERKELEY_DB),y)
--	TARGETS += arpd
--endif
-+#ifeq ($(HAVE_BERKELEY_DB),y)
-+#	TARGETS += arpd
-+#endif
- 
- ifeq ($(HAVE_SELINUX),y)
- 	LDLIBS += $(shell pkg-config --libs libselinux)
diff --git a/meta-sysmocom-bsp/yocto-master/iproute2_%.bbappend b/meta-sysmocom-bsp/yocto-master/iproute2_%.bbappend
index b10b7ccee3..433c845367 100644
--- a/meta-sysmocom-bsp/yocto-master/iproute2_%.bbappend
+++ b/meta-sysmocom-bsp/yocto-master/iproute2_%.bbappend
@@ -1 +1,4 @@
-require recipes-fixes/iproute2/${PN}_sysmocom.inc
+PACKAGES += "${PN}-misc"
+ALLOW_EMPTY_${PN}-misc = "1"
+
+RDEPENDS_${PN}-misc = "${PN}-ss ${PN}-nstat ${PN}-ifstat ${PN}-rtacct ${PN}-lnstat"
diff --git a/meta-sysmocom-bsp/yocto-master/udev_182.bbappend b/meta-sysmocom-bsp/yocto-master/udev_182.bbappend
deleted file mode 100644
index 9e035919af..0000000000
--- a/meta-sysmocom-bsp/yocto-master/udev_182.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-require recipes-fixes/${PN}/${PN}_sysmocom.inc