diff --git a/meta-sysmocom-bsp/recipes-bsp/linux/linux-sysmocom.inc b/meta-sysmocom-bsp/recipes-bsp/linux/linux-sysmocom.inc
index b60586db2f..470a19a129 100644
--- a/meta-sysmocom-bsp/recipes-bsp/linux/linux-sysmocom.inc
+++ b/meta-sysmocom-bsp/recipes-bsp/linux/linux-sysmocom.inc
@@ -12,3 +12,12 @@ module_autoload_mISDN_dsp = "mISDN_dsp"
 module_conf_mISDN_l1loop = "options mISDN_l1loop pri=1 nchannel=20"
 
 FILES_${PN} = ""
+
+# Remove when using a Poky/OE-Core with that includes e0bf758982843ec1981b74410616b3492c599d06
+pkg_postinst_kernel () {
+       update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE}-${KERNEL_VERSION} ${KERNEL_PRIORITY} || true
+}
+
+pkg_postrm_kernel () {
+       update-alternatives --remove ${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE}-${KERNEL_VERSION} || true
+}
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 01dacf7e58..f3c0dbad01 100644
--- a/meta-sysmocom-bsp/recipes-bsp/linux/linux-sysmocom_git.bb
+++ b/meta-sysmocom-bsp/recipes-bsp/linux/linux-sysmocom_git.bb
@@ -12,7 +12,7 @@ BTS_FIRMWARE_NAME_sysmobts-v2 = "sysmobts-v2"
 
 SRCREV = "20b5f4f07eb6719e41cc6d25fc2a73d95337421c"
 
-PR = "r24"
+PR = "r26"
 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/linux/linux_2.6.39.bb b/meta-sysmocom-bsp/recipes-bsp/linux/linux_2.6.39.bb
index 22478f944d..fcd864d6db 100644
--- a/meta-sysmocom-bsp/recipes-bsp/linux/linux_2.6.39.bb
+++ b/meta-sysmocom-bsp/recipes-bsp/linux/linux_2.6.39.bb
@@ -3,7 +3,7 @@ require linux-sysmocom.inc
 
 LINUX_VERSION ?= "${PV}"
 
-PR = "r13"
+PR = "r15"
 SRC_URI = "${KERNELORG_MIRROR}/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
 	   ftp://ftp.servus.at/linux-kernel/patch-2.6.39.4.bz2;apply=yes;name=stablepatch \
 	   file://mISDN_loop.patch \
diff --git a/meta-sysmocom-bsp/recipes-sysmobts/femtobts-api/femtobts-api_2.4.bb b/meta-sysmocom-bsp/recipes-sysmobts/femtobts-api/femtobts-api_2.4.bb
new file mode 100644
index 0000000000..661de4865a
--- /dev/null
+++ b/meta-sysmocom-bsp/recipes-sysmobts/femtobts-api/femtobts-api_2.4.bb
@@ -0,0 +1,26 @@
+DESCRIPTION = "sysmoBTS Layer1 API header files"
+SECTION = "kernel"
+LICENSE = "CLOSED"
+
+SRC_URI = "git://git.sysmocom.de/sysmo-bts/layer1-api.git;protocol=git;branch=master"
+SRCREV = "superfemto_v2.4"
+PV = "2.4"
+PR = "r1"
+S = "${WORKDIR}/git"
+
+
+do_compile() {
+	:
+}
+
+do_install() {
+	install -d ${D}${includedir}/sysmocom/femtobts
+	install -d ${D}${libdir}/pkgconfig
+
+	install -m 0755 ${S}/include/* ${D}${includedir}/sysmocom/femtobts/
+	echo "Name: Sysmocom sysmoBTS Layer1 API
+Description: Sysmocom sysmoBTS Layer1 API
+Versions: 2.0
+Libs:
+Cflags: -I${includedir}/sysmocom/femtobts" > ${D}${libdir}/pkgconfig/sysmocom-btsapi.pc
+}
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 3e58b38a64..a5686efcb1 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
@@ -1,11 +1,12 @@
-DESCRIPTION = "sysmocom FemtoBTS API headers"
+DESCRIPTION = "sysmoBTS Layer1 API header files"
 SECTION = "kernel"
 LICENSE = "CLOSED"
 
-SRC_URI = "git://git.sysmocom.de/sysmo-bts/femtobts-firmware.git;protocol=git;branch=master"
-SRCREV = "997a9439c8209d4b134c1fdbd2820c956f1cfe43"
-PV = "2.4+git${SRCPV}"
-PR = "r7"
+SRC_URI = "git://git.sysmocom.de/sysmo-bts/layer1-api.git;protocol=git;branch=master"
+SRCREV_sysmobts-v2 = "superfemto_v3.0.1pre"
+SRCREV_sysmobts-v1 = "femtobts_v2.7"
+PV = "${SRCREV}+git${SRCPV}"
+PR = "r2"
 S = "${WORKDIR}/git"
 
 
@@ -17,9 +18,9 @@ do_install() {
 	install -d ${D}${includedir}/sysmocom/femtobts
 	install -d ${D}${libdir}/pkgconfig
 
-	install -m 0755 ${S}/api/* ${D}${includedir}/sysmocom/femtobts/
-	echo "Name: Sysmocom FemtoBTS API
-Description: Sysmocom FemtoBTS API
+	install -m 0755 ${S}/include/* ${D}${includedir}/sysmocom/femtobts/
+	echo "Name: Sysmocom sysmoBTS Layer1 API
+Description: Sysmocom sysmoBTS Layer1 API
 Versions: 2.0
 Libs:
 Cflags: -I${includedir}/sysmocom/femtobts" > ${D}${libdir}/pkgconfig/sysmocom-btsapi.pc
diff --git a/meta-sysmocom-bsp/recipes-sysmobts/firmware/sysmobts-firmware.inc b/meta-sysmocom-bsp/recipes-sysmobts/firmware/sysmobts-firmware.inc
new file mode 100644
index 0000000000..293ff967b9
--- /dev/null
+++ b/meta-sysmocom-bsp/recipes-sysmobts/firmware/sysmobts-firmware.inc
@@ -0,0 +1,14 @@
+DESCRIPTION = "sysmocom sysmoBTS DSP and FPGA firmware"
+SECTION = "kernel"
+LICENSE = "CLOSED"
+
+SRC_URI = "file://sysmobts-firmware-${FIRMWARE-VERSION}.tar.bz2"
+S = "${WORKDIR}/sysmobts-firmware-${FIRMWARE-VERSION}"
+
+INC_PR = "1"
+
+do_compile() {
+	:
+}
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/meta-sysmocom-bsp/recipes-sysmobts/firmware/sysmobts-firmware_2.7.bb b/meta-sysmocom-bsp/recipes-sysmobts/firmware/sysmobts-firmware_2.7.bb
new file mode 100644
index 0000000000..fc2324ccd4
--- /dev/null
+++ b/meta-sysmocom-bsp/recipes-sysmobts/firmware/sysmobts-firmware_2.7.bb
@@ -0,0 +1,15 @@
+COMPATIBLE_MACHINE = "sysmobts-v1"
+FIRMWARE-VERSION = "femtobts_v${PV}"
+PR = "r2.${INC_PR}"
+
+require ${PN}.inc
+
+do_install_sysmobts() {
+	install -d ${D}/lib/firmware/
+
+	install -m 0666 ${S}/Firmware/Dsp/femtobts.out ${D}/lib/firmware/sysmobts-v1.out
+	install -m 0666 ${S}/Firmware/Fpga/femtobts.bit ${D}/lib/firmware/sysmobts-v1.bit
+}
+
+
+FILES_${PN} = "/lib/firmware/sysmobts-v1*"
diff --git a/meta-sysmocom-bsp/recipes-sysmobts/firmware/sysmobts-firmware_3.0.1pre.bb b/meta-sysmocom-bsp/recipes-sysmobts/firmware/sysmobts-firmware_3.0.1pre.bb
new file mode 100644
index 0000000000..718002492e
--- /dev/null
+++ b/meta-sysmocom-bsp/recipes-sysmobts/firmware/sysmobts-firmware_3.0.1pre.bb
@@ -0,0 +1,14 @@
+COMPATIBLE_MACHINE = "sysmobts-v2"
+FIRMWARE-VERSION = "superfemto_v${PV}"
+PR = "r2.${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_git.bb b/meta-sysmocom-bsp/recipes-sysmobts/firmware/sysmobts-firmware_git.bb
deleted file mode 100644
index 19603f0cd1..0000000000
--- a/meta-sysmocom-bsp/recipes-sysmobts/firmware/sysmobts-firmware_git.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-DESCRIPTION = "sysmocom sysmoBTS firmware"
-SECTION = "kernel"
-LICENSE = "CLOSED"
-
-
-SRC_URI = "git://git.sysmocom.de/sysmo-bts/femtobts-firmware;protocol=git;branch=master"
-SRCREV = "997a9439c8209d4b134c1fdbd2820c956f1cfe43"
-S = "${WORKDIR}/git"
-
-PV = "2.4+git${SRCPV}"
-PR = "r0"
-
-do_compile() {
-	:
-}
-
-do_install() {
-	install -d ${D}/lib/firmware/
-
-	install -m 0666 ${S}/firmware/sysmobts* ${D}/lib/firmware
-}
-
-FILES_${PN}_sysmobts-v1 = "/lib/firmware/sysmobts-v1*"
-FILES_${PN}_sysmobts-v2 = "/lib/firmware/sysmobts-v2*"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
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 8f5a896498..a0f0f0393b 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 = "f3e508493b2039ae0f7408ccf7ab2dcd362376fa"
-SRCREV_openbsc = "94c2b0578b4827e5535296477c3cd1d39d8f4814"
-PV = "0.0+git${SRCPV}"
-PR = "r24.${META_TELEPHONY_OSMO_INC}"
+SRCREV_osmobts = "0d30b5d81863fb70c6270fe1ffefe4fd426b0cd3"
+SRCREV_openbsc = "25b70cea9d9521b081ea0cc524f5d157a1b89baf"
+PV = "0.1.0+git${SRCPV}"
+PR = "r4.${META_TELEPHONY_OSMO_INC}"
 S = "${WORKDIR}/git"
 
 SRCREV_FORMAT = "openbsc-rosmobts"
@@ -26,7 +26,7 @@ do_configure_prepend() {
 	ln -sf ../openbsc openbsc
 }
 
-do_compile_append() {
+do_compile_append_sysmobts-v2() {
 	cd ${S}/contrib/sysmobts-calib/
 	oe_runmake
 }
@@ -39,6 +39,9 @@ do_install_append() {
 	install -d ${D}${sysconfdir}/init.d
 	install -m 0755 ${S}/contrib/sysmobts.init ${D}${sysconfdir}/init.d/sysmobts
 
+}
+
+do_install_append_sysmobts-v2() {
 	install -m 0755 ${S}/contrib/sysmobts-calib/sysmobts-calib ${D}${bindir}/
 }
 
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 54e6643329..14a962c59c 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,14 +3,14 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM="file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
 SRC_URI = "git://git.osmocom.org/osmo-pcu.git;protocol=git;branch=jolly"
-SRCREV = "3ef16cc04a096ea5bbec5bb4e3988cc5d16766e9"
+SRCREV = "a23c7eee151c1e92dacaadb823b26d426a904564"
 PV = "0.0+git${SRCPV}"
-PR = "r4.${META_TELEPHONY_OSMO_INC}"
+PR = "r5.${META_TELEPHONY_OSMO_INC}"
 S = "${WORKDIR}/git"
 
 DEPENDS = "libosmocore femtobts-api osmo-bts"
 
-EXTRA_OECONF += "--enable-sysmocom-bts"
+EXTRA_OECONF += "--enable-sysmocom-dsp"
 
 inherit autotools