diff --git a/meta-telephony/recipes-misc/lksctp-tools/lksctp-tools/run-ptest b/meta-telephony/recipes-misc/lksctp-tools/lksctp-tools/run-ptest
new file mode 100644
index 0000000000..e67f18e55a
--- /dev/null
+++ b/meta-telephony/recipes-misc/lksctp-tools/lksctp-tools/run-ptest
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+sh v4test.sh
+sh v6test.sh
+
diff --git a/meta-telephony/recipes-misc/lksctp-tools/lksctp-tools/v4test.sh b/meta-telephony/recipes-misc/lksctp-tools/lksctp-tools/v4test.sh
new file mode 100644
index 0000000000..5130856999
--- /dev/null
+++ b/meta-telephony/recipes-misc/lksctp-tools/lksctp-tools/v4test.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+echo "v4test starting:"
+for t in $(find -maxdepth 1 -type f \! -name test\*_v6 -name test\*); do
+  echo "$t";
+  if $t; then
+    echo "PASS: $t"; echo "";
+  else
+    echo "FAIL: $t"; echo "";
+  fi
+  sleep 1;
+done
diff --git a/meta-telephony/recipes-misc/lksctp-tools/lksctp-tools/v6test.sh b/meta-telephony/recipes-misc/lksctp-tools/lksctp-tools/v6test.sh
new file mode 100644
index 0000000000..3a667df820
--- /dev/null
+++ b/meta-telephony/recipes-misc/lksctp-tools/lksctp-tools/v6test.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+echo "v6test starting:"
+for t in $(find -maxdepth 1 -name test\*_v6); do
+  echo "$t";
+  if $t; then
+    echo "PASS: $t"; echo "";
+  else
+    echo "FAIL: $t"; echo "";
+  fi
+  sleep 1;
+done
diff --git a/meta-telephony/recipes-misc/lksctp-tools/lksctp-tools_1.0.16.bb b/meta-telephony/recipes-misc/lksctp-tools/lksctp-tools_1.0.16.bb
new file mode 100644
index 0000000000..d3e6a5dda8
--- /dev/null
+++ b/meta-telephony/recipes-misc/lksctp-tools/lksctp-tools_1.0.16.bb
@@ -0,0 +1,65 @@
+SUMMARY = "The Linux Kernel Stream Control Transmission Protocol (lksctp) project"
+HOMEPAGE = "http://lksctp.org"
+SECTION = "net"
+LICENSE = "LGPLv2.1 & GPLv2"
+
+LIC_FILES_CHKSUM = " \
+    file://COPYING.lib;md5=0a1b79af951c42a9c8573533fbba9a92 \
+    file://COPYING;md5=0c56db0143f4f80c369ee3af7425af6e \
+"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/lksctp/${BP}.tar.gz \
+           file://run-ptest \
+           file://v4test.sh \
+           file://v6test.sh \
+          "
+
+SRC_URI[md5sum] = "708bb0b5a6806ad6e8d13c55b067518e"
+SRC_URI[sha256sum] = "0903dd526b7f30a89d5031aa2c82757612becc38ed7bc6e4f972f8deae351f26"
+
+#| arm-oe-linux-gnueabi-libtool: link: arm-oe-linux-gnueabi-gcc  -march=armv5te -marm -mthumb-interwork --sysroot=/home/jenkins/oe/world/shr-core/tmp-eglibc/sysroots/qemuarm -shared  -fPIC -DPIC  .libs/bindx.o .libs/connectx.o .libs/peeloff.o .libs/opt_info.o .libs/addrs.o .libs/sendmsg.o .libs/recvmsg.o    -march=armv5te -marm -mthumb-interwork --sysroot=/home/jenkins/oe/world/shr-core/tmp-eglibc/sysroots/qemuarm -O2 -Wl,--version-script=/home/jenkins/oe/world/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/lksctp-tools/1.0.16-r0/lksctp-tools-1.0.16/src/lib/Versions.map -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed   -Wl,-soname -Wl,libsctp.so.1 -o .libs/libsctp.so.1.0.16
+#| /home/jenkins/oe/world/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/libexec/arm-oe-linux-gnueabi/gcc/arm-oe-linux-gnueabi/4.9.0/ld: error: symbol sctp_connectx has undefined version
+#| collect2: error: ld returned 1 exit status
+#| make[4]: *** [libsctp.la] Error 1
+PNBLACKLIST[lksctp-tools] ?= "${@base_contains('DISTRO_FEATURES', 'ld-is-gold', "BROKEN: fails to link against sctp_connectx symbol", '', d)}"
+
+S = "${WORKDIR}/${BP}"
+
+BBCLASSEXTEND = "native"
+
+inherit autotools pkgconfig binconfig ptest
+
+do_install_ptest () {
+	install -m 0755 ${WORKDIR}/v4test.sh ${D}${PTEST_PATH}
+	install -m 0755 ${WORKDIR}/v6test.sh ${D}${PTEST_PATH}
+	for testcase in `find ${B}/src/apps/.libs ${B}/src/func_tests/.libs -maxdepth 1 -type f -executable`; do
+		install $testcase ${D}${PTEST_PATH}
+	done
+}
+
+SOLIBVERSION="${PV}"
+SOLIBMAJORVERSION="1"
+
+PACKAGES =+ "${PN}-withsctp ${PN}-utils"
+
+FILES_${PN} = " \
+    ${libdir}/libsctp.so.${SOLIBVERSION} \
+    ${libdir}/libsctp.so.${SOLIBMAJORVERSION} \
+"
+
+FILES_${PN}-withsctp = " \
+    ${libdir}/lksctp-tools/libwithsctp.so.${SOLIBVERSION} \
+    ${libdir}/lksctp-tools/libwithsctp.so.${SOLIBMAJORVERSION} \
+"
+
+FILES_${PN}-dev += " \
+    ${libdir}/libsctp.so \
+    ${libdir}/lksctp-tools/libwithsctp.so \
+    ${datadir}/lksctp-tools/*.c \
+    ${datadir}/lksctp-tools/*.h \
+"
+
+FILES_${PN}-utils = "${bindir}/*"
+
+RRECOMMENDS_${PN}-utils += "kernel-module-sctp"
+RRECOMMENDS_${PN}-ptest += "kernel-module-sctp"
diff --git a/meta-telephony/recipes-osmocom/libosmocore/libosmocore_git.bb b/meta-telephony/recipes-osmocom/libosmocore/libosmocore_git.bb
index 9101886c66..e482f8c538 100644
--- a/meta-telephony/recipes-osmocom/libosmocore/libosmocore_git.bb
+++ b/meta-telephony/recipes-osmocom/libosmocore/libosmocore_git.bb
@@ -4,9 +4,23 @@ S = "${WORKDIR}/git"
 SRCREV = "70fcbda6dd733a503e9a046e01986d8bfc2e2bb2"
 SRC_URI = "git://git.osmocom.org/libosmocore.git;protocol=git;nobranch=1"
 PV = "0.9.0+gitr${SRCPV}"
-PR = "r0"
+PR = "r1"
 
-PACKAGES =+ "libosmoctrl"
+PACKAGES =+ "libosmoctrl libosmocodec libosmogb libosmogsm libosmovty osmo-arfcn osmo-auc-gen"
 FILES_libosmoctrl = "${libdir}/libosmoctrl${SOLIBS}"
+FILES_libosmocodec = "${libdir}/libosmocodec${SOLIBS}"
+FILES_libosmogb = "${libdir}/libosmogb${SOLIBS}"
+FILES_libosmogsm = "${libdir}/libosmogsm${SOLIBS}"
+FILES_libosmovty = "${libdir}/libosmovty${SOLIBS}"
+FILES_osmo-arfcn = "${bindir}/osmo-arfcn"
+FILES_osmo-auc-gen = "${bindir}/osmo-auc-gen"
+
+# Requires fix for upgrades
+RREPLACES_libosmocore = "DONOTREPLACElibosmocore"
+RREPLACES_libosmoctrl = "DONOTREPLACElibosmocore"
+RREPLACES_libosmocodec = "DONOTREPLACElibosmocore"
+RREPLACES_libosmogb = "DONOTREPLACElibosmocore"
+RREPLACES_libosmogsm = "DONOTREPLACElibosmocore"
+RREPLACES_libosmovty = "DONOTREPLACElibosmocore"
 
 EXTRA_OECONF += "--disable-pcsc"
diff --git a/meta-telephony/recipes-osmocom/packagegroup/packagegroup-sdk-osmo.inc b/meta-telephony/recipes-osmocom/packagegroup/packagegroup-sdk-osmo.inc
index 8a520165fd..0a3f1d4c95 100644
--- a/meta-telephony/recipes-osmocom/packagegroup/packagegroup-sdk-osmo.inc
+++ b/meta-telephony/recipes-osmocom/packagegroup/packagegroup-sdk-osmo.inc
@@ -1,4 +1,6 @@
 SDK-OSMO = " \
+    lksctp-tools-dev \
+    libusb1-dev \
     libtalloc-dev \
     libosmocore-dev \
     libosmo-sccp-staticdev \