diff --git a/recipes-apps/tasks/task-sysmocom-bts.bb b/recipes-apps/tasks/task-sysmocom-bts.bb
index 9863ff1..246bd6c 100644
--- a/recipes-apps/tasks/task-sysmocom-bts.bb
+++ b/recipes-apps/tasks/task-sysmocom-bts.bb
@@ -4,12 +4,13 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 DEPENDS = "virtual/kernel"
 ALLOW_EMPTY = "1"
-PR = "r11"
+PR = "r12"
 
 # TODO: re-add femtobts-calib after it went through the API migration
 RDEPENDS_task-sysmocom-bts = "\
     osmo-bts \
     osmo-bts-remote \
+    sysmobts-calib \
     lmsensors-scripts \
     "
 
diff --git a/recipes-sysmobts/osmo-bts/osmo-bts_git.bb b/recipes-sysmobts/osmo-bts/osmo-bts_git.bb
index df08064..1fcff23 100644
--- a/recipes-sysmobts/osmo-bts/osmo-bts_git.bb
+++ b/recipes-sysmobts/osmo-bts/osmo-bts_git.bb
@@ -7,7 +7,7 @@ SRC_URI = "git://git.osmocom.org/osmo-bts.git;protocol=git;branch=master;name=os
 SRCREV_osmobts = "b19592f7134baeae1541e55b6efead887739291d"
 SRCREV_openbsc = "019f913ca383bda9256e273c06327041b1761330"
 PV = "0.0+git${SRCPV}"
-PR = "r20"
+PR = "r21"
 S = "${WORKDIR}/git"
 
 SRCREV_FORMAT = "openbsc-rosmobts"
@@ -26,6 +26,11 @@ do_configure_prepend() {
 	ln -sf ../openbsc openbsc
 }
 
+do_compile_append() {
+	cd ${S}/contrib/sysmobts-calib/
+	oe_runmake
+}
+
 do_install_append() {
 	install -d ${D}${sysconfdir}/osmocom
 	install -m 0660 ${S}/doc/examples/osmo-bts.cfg ${D}${sysconfdir}/osmocom
@@ -33,6 +38,8 @@ do_install_append() {
 	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
+
+	install -m 0755 ${S}/contrib/sysmobts-calib/sysmobts-calib ${D}${bindir}/
 }
 
 CONFFILES_${PN} = "${sysconfdir}/osmocom/osmo-bts.cfg"
@@ -40,6 +47,7 @@ INITSCRIPT_PACKAGES = "${PN}"
 INITSCRIPT_NAME_${PN} = "sysmobts"
 INITSCRIPT_PARAMS_${PN} = "defaults 30 30"
 
-PACKAGES =+ "osmo-bts-remote"
+PACKAGES =+ "osmo-bts-remote sysmobts-calib"
 
 FILES_osmo-bts-remote = " ${bindir}/sysmobts-remote "
+FILES_sysmobts-calib = " ${bindir}/sysmobts-calib "