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 71502366ef..ec91bf123f 100644
--- a/meta-sysmocom-bsp/recipes-apps/tasks/task-sysmocom-bts.bb
+++ b/meta-sysmocom-bsp/recipes-apps/tasks/task-sysmocom-bts.bb
@@ -4,14 +4,17 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 DEPENDS = "virtual/kernel"
 ALLOW_EMPTY = "1"
-PR = "r13"
+PR = "r17"
+
+CALIB = ""
+CALIB_sysmobts-v2 = "sysmobts-calib"
 
 # TODO: re-add femtobts-calib after it went through the API migration
-RDEPENDS_task-sysmocom-bts = "\
+RDEPENDS_${PN} = "\
     osmo-bts \
     osmo-bts-remote \
-    sysmobts-calib \
     osmo-pcu \
     lmsensors-scripts \
+    ${CALIB} \
     "
-
+PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/meta-sysmocom-bsp/recipes-fixes/dropbear/files/init b/meta-sysmocom-bsp/recipes-fixes/dropbear/files/init
index 8b99ecb4a3..c1747e744e 100644
--- a/meta-sysmocom-bsp/recipes-fixes/dropbear/files/init
+++ b/meta-sysmocom-bsp/recipes-fixes/dropbear/files/init
@@ -58,13 +58,13 @@ gen_keys() {
 for t in $DROPBEAR_KEYTYPES; do
   case $t in
     rsa)
-        if [ ! -s $DROPBEAR_RSAKEY ]; then
+        if [ -f "$DROPBEAR_RSAKEY" -a ! -s "$DROPBEAR_RSAKEY" ]; then
                 rm $DROPBEAR_RSAKEY
         fi
         test -f $DROPBEAR_RSAKEY || dropbearkey -t rsa -f $DROPBEAR_RSAKEY
         ;;
     dsa)
-        if [ ! -s $DROPBEAR_DSSKEY ]; then
+        if [ -f "$DROPBEAR_DSSKEY" -a ! -s "$DROPBEAR_DSSKEY" ]; then
                 rm $DROPBEAR_DSSKEY
         fi
         test -f $DROPBEAR_DSSKEY || dropbearkey -t dss -f $DROPBEAR_DSSKEY
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 9969df4255..aa7a7293fa 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,8 +4,8 @@ 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 = "0d30b5d81863fb70c6270fe1ffefe4fd426b0cd3"
-SRCREV_openbsc = "25b70cea9d9521b081ea0cc524f5d157a1b89baf"
+SRCREV_osmobts = "24b2128e2975f14f9941caa156890480005df81e"
+SRCREV_openbsc = "f2621e506de5fdbe7d800c4b1a9e764d7c9cdeef"
 PV = "0.1.0+git${SRCPV}"
 PR = "r6.${META_TELEPHONY_OSMO_INC}"
 S = "${WORKDIR}/git"
@@ -35,6 +35,7 @@ do_install_append() {
 	install -d ${D}${sysconfdir}/osmocom
 	install -m 0660 ${S}/doc/examples/osmo-bts.cfg ${D}${sysconfdir}/osmocom
 	install -m 0755 ${S}/contrib/respawn.sh ${D}${sysconfdir}/osmocom/
+	install -m 0755 ${S}/contrib/respawn-only.sh ${D}${sysconfdir}/osmocom/
 	install -m 0644 ${S}/contrib/screenrc-sysmobts ${D}${sysconfdir}/osmocom/
 	install -d ${D}${sysconfdir}/init.d
 	install -m 0755 ${S}/contrib/sysmobts.init ${D}${sysconfdir}/init.d/sysmobts
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 14a962c59c..e0732d7585 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
@@ -2,17 +2,17 @@ DESCRIPTION = "Osmocom PCU for sysmoBTS"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM="file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
-SRC_URI = "git://git.osmocom.org/osmo-pcu.git;protocol=git;branch=jolly"
-SRCREV = "a23c7eee151c1e92dacaadb823b26d426a904564"
+SRC_URI = "git://git.osmocom.org/osmo-pcu.git;protocol=git;branch=jolly_merge"
+SRCREV = "9aaf2ae24d544ce149fde7685ca0421d31262a09"
 PV = "0.0+git${SRCPV}"
-PR = "r5.${META_TELEPHONY_OSMO_INC}"
+PR = "r8.${META_TELEPHONY_OSMO_INC}"
 S = "${WORKDIR}/git"
 
 DEPENDS = "libosmocore femtobts-api osmo-bts"
 
-EXTRA_OECONF += "--enable-sysmocom-dsp"
+EXTRA_OECONF += "--enable-sysmocom-bts --enable-sysmocom-dsp"
 
-inherit autotools
+inherit autotools_stage
 
 # Select the API version
 inherit femtobts_api