diff --git a/meta-telephony/recipes-misc/ortp/ortp_0.22.0.bb b/meta-telephony/recipes-misc/ortp/ortp_0.22.0.bb
new file mode 100644
index 0000000000..20c2d4a93c
--- /dev/null
+++ b/meta-telephony/recipes-misc/ortp/ortp_0.22.0.bb
@@ -0,0 +1,6 @@
+require ortp.inc
+DEPENDS = "glib-2.0 openssl"
+PR = "${INC_PR}.1"
+
+SRC_URI[md5sum] = "119357e1d904be0289e57c80e5ad90ba"
+SRC_URI[sha256sum] = "6e37e29b3c3559bac1f2ae0c977f6ceb4d4ce8dc713b691dea8bae57bda92d0b"
diff --git a/meta-telephony/recipes-osmocom/libasn1c/libasn1c.inc b/meta-telephony/recipes-osmocom/libasn1c/libasn1c.inc
new file mode 100644
index 0000000000..c3c221f327
--- /dev/null
+++ b/meta-telephony/recipes-osmocom/libasn1c/libasn1c.inc
@@ -0,0 +1,11 @@
+DESCRIPTION = "library to build asn1c generated sources"
+DEPENDS = "libtalloc"
+DEPENDS_append_geode = "dahdi-linux"
+HOMEPAGE = "http://osmocom.org"
+LICENSE = "AGPLv3"
+
+INC_PR="r2.${META_TELEPHONY_OSMO_INC}"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=25192323023bb0db6998ac6fcd5aa6a1"
+
+inherit autotools pkgconfig
diff --git a/meta-telephony/recipes-osmocom/libasn1c/libasn1c_git.bb b/meta-telephony/recipes-osmocom/libasn1c/libasn1c_git.bb
new file mode 100644
index 0000000000..6bd8b0bc88
--- /dev/null
+++ b/meta-telephony/recipes-osmocom/libasn1c/libasn1c_git.bb
@@ -0,0 +1,7 @@
+require ${PN}.inc
+
+S = "${WORKDIR}/git"
+SRCREV = "20d668cbd3c14ef32fcbd09617fbd3c8e6856ec0"
+SRC_URI = "git://git.osmocom.org/libasn1c.git;protocol=git"
+PV = "0.1+gitr${SRCPV}"
+PR = "${INC_PR}.1"
diff --git a/meta-telephony/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb b/meta-telephony/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb
index 8010389286..68ec1c9818 100644
--- a/meta-telephony/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb
+++ b/meta-telephony/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb
@@ -1,7 +1,7 @@
 require ${PN}.inc
 
 S = "${WORKDIR}/git"
-SRCREV = "3cef39b03cb46de4a7aba65137d724a000b184cb"
+SRCREV = "bf7976c0b0076410ad1bd67061dd18d0f33a7f43"
 SRC_URI = "git://git.osmocom.org/libosmo-abis.git;protocol=git"
 PV = "0.3.2+gitr${SRCPV}"
 PR = "${INC_PR}.1"
diff --git a/meta-telephony/recipes-osmocom/libosmo-netif/libosmo-netif_git.bb b/meta-telephony/recipes-osmocom/libosmo-netif/libosmo-netif_git.bb
index bbfa7c07b9..ce44351c6e 100644
--- a/meta-telephony/recipes-osmocom/libosmo-netif/libosmo-netif_git.bb
+++ b/meta-telephony/recipes-osmocom/libosmo-netif/libosmo-netif_git.bb
@@ -1,7 +1,7 @@
 require ${PN}.inc
 
 S = "${WORKDIR}/git"
-SRCREV = "efb9af4dada5e2426e69d670f4549f8fec3c9cb2"
+SRCREV = "56add1e78064698fdf909cf000d413357303af8a"
 SRC_URI = "git://git.osmocom.org/libosmo-netif.git;protocol=git"
 PV = "0.4.0+gitr${SRCPV}"
 PR = "${INC_PR}.2"
diff --git a/meta-telephony/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb b/meta-telephony/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb
new file mode 100644
index 0000000000..829f309c6c
--- /dev/null
+++ b/meta-telephony/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb
@@ -0,0 +1,13 @@
+require ${PN}.inc
+
+DEPENDS += " libosmo-netif lksctp-tools "
+RDEPENDS_libosmo-sccp += " kernel-module-sctp "
+S = "${WORKDIR}/git"
+SRCREV = "8e708d1f2da1b187f631bf08172a5194a85b1a23"
+SRC_URI = "git://git.osmocom.org/libosmo-sccp.git;protocol=git"
+PR = "${INC_PR}.1"
+
+# because "${WORKDIR}/git" is not a git repo, it can't figure out the version
+do_configure_prepend() {
+    echo "${PV}" > ${S}/.tarball-version
+}
diff --git a/meta-telephony/recipes-osmocom/libosmocore/libosmocore.inc b/meta-telephony/recipes-osmocom/libosmocore/libosmocore.inc
index de5742f448..a1176738da 100644
--- a/meta-telephony/recipes-osmocom/libosmocore/libosmocore.inc
+++ b/meta-telephony/recipes-osmocom/libosmocore/libosmocore.inc
@@ -8,3 +8,4 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
 
 inherit autotools pkgconfig
 
+DEPENDS="libtalloc"
diff --git a/meta-telephony/recipes-osmocom/libosmocore/libosmocore_git.bb b/meta-telephony/recipes-osmocom/libosmocore/libosmocore_git.bb
index e482f8c538..3cec1d8f69 100644
--- a/meta-telephony/recipes-osmocom/libosmocore/libosmocore_git.bb
+++ b/meta-telephony/recipes-osmocom/libosmocore/libosmocore_git.bb
@@ -1,7 +1,7 @@
 require ${PN}.inc
 
 S = "${WORKDIR}/git"
-SRCREV = "70fcbda6dd733a503e9a046e01986d8bfc2e2bb2"
+SRCREV = "409e897df56b62b8282d54e759e2f30f0476ab12"
 SRC_URI = "git://git.osmocom.org/libosmocore.git;protocol=git;nobranch=1"
 PV = "0.9.0+gitr${SRCPV}"
 PR = "r1"
diff --git a/meta-telephony/recipes-osmocom/openggsn/openggsn_git.bb b/meta-telephony/recipes-osmocom/openggsn/openggsn_git.bb
index 790bf56fa1..8d01285220 100644
--- a/meta-telephony/recipes-osmocom/openggsn/openggsn_git.bb
+++ b/meta-telephony/recipes-osmocom/openggsn/openggsn_git.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
 PV = "0.91+gitr${SRCPV}"
 PR = "r14"
 
-SRCREV = "b07d07072e70ac4f920be9dfdf45615193b4ec2d"
+SRCREV = "a2861a7428ef62dbef02a502a6bfd6c6e9623263"
 SRC_URI = "git://git.osmocom.org/openggsn                   \
            file://openggsn.init                             \
 	   file://libgtp-queue_depth_32.patch		    \
@@ -33,7 +33,7 @@ INITSCRIPT_PARAMS_openggsn = "defaults 29 29"
 RDEPENDS_${PN} += "iptables kernel-module-ipt-masquerade"
 
 FILES_libgtp = "${libdir}/*${SOLIBS}"
-FILES_libgtp-dev = "${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la"
+FILES_libgtp-dev = "${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la ${libdir}/pkgconfig/*"
 FILES_libgtp-staticdev = "${libdir}/*.a"
 
 FILES_openggsn-sgsnemu = "${bindir}/sgsnemu"
diff --git a/meta-telephony/recipes-osmocom/osmo-hlr/.osmo-msc_git.bb.swp b/meta-telephony/recipes-osmocom/osmo-hlr/.osmo-msc_git.bb.swp
new file mode 100644
index 0000000000..042d535390
Binary files /dev/null and b/meta-telephony/recipes-osmocom/osmo-hlr/.osmo-msc_git.bb.swp differ
diff --git a/meta-telephony/recipes-osmocom/osmo-hlr/osmo-hlr.inc b/meta-telephony/recipes-osmocom/osmo-hlr/osmo-hlr.inc
new file mode 100644
index 0000000000..6bef6615c9
--- /dev/null
+++ b/meta-telephony/recipes-osmocom/osmo-hlr/osmo-hlr.inc
@@ -0,0 +1,44 @@
+DESCRIPTION = "Osmocom GSM/UMTS Home Location Register"
+DEPENDS = "libosmocore libosmo-abis sqlite3 sqlite3-native"
+HOMEPAGE = "http://osmocom.org/projects/osmo-hlr"
+LICENSE = "AGPLv3+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=73f1eb20517c55bf9493b7dd6e480788"
+
+SRC_URI = "file://osmo-hlr.init"
+
+INC_PR = "r1.${META_TELEPHONY_OSMO_INC}"
+
+inherit autotools update-rc.d pkgconfig
+
+# because "${WORKDIR}/git" is not a git repo, it can't figure out the version
+do_configure_prepend() {
+	echo "${PV}" > ${S}/.tarball-version
+}
+
+do_install_append() {
+	install -d ${D}${sysconfdir}/osmocom
+	install -m 0660 ${S}/doc/examples/osmo-hlr.cfg ${D}${sysconfdir}/osmocom/osmo-hlr.cfg
+
+	# Install sysv-init files
+	install -d ${D}${sysconfdir}/init.d
+	install -d ${D}${sysconfdir}/rc5.d
+	install -m 0775 ${WORKDIR}/osmo-hlr.init ${D}${sysconfdir}/init.d/osmo-hlr
+
+	# Install systemd files and enable on sysinit
+	install -d ${D}${systemd_unitdir}/system
+	install -m 0644 ${S}/contrib/systemd/osmo-hlr.service ${D}${systemd_unitdir}/system/
+
+	install -d ${D}/var/lib/osmocom
+	sqlite3 ${D}/var/lib/osmocom/hlr.db < ${S}/sql/hlr.sql
+}
+
+INITSCRIPT_PACKAGES = "osmo-hlr"
+
+# Do not start any of the services by default
+SYSTEMD_AUTO_ENABLE = "disable"
+
+CONFFILES_${PN} = "${sysconfdir}/osmocom/osmo-hlr.cfg"
+INITSCRIPT_NAME_${PN} = "osmo-hlr"
+INITSCRIPT_PARAMS_${PN} = "defaults 30 30"
+
+FILES_${PN} += "${systemd_unitdir}/system/osmo-hlr.service"
diff --git a/meta-telephony/recipes-osmocom/osmo-hlr/osmo-hlr/osmo-hlr.init b/meta-telephony/recipes-osmocom/osmo-hlr/osmo-hlr/osmo-hlr.init
new file mode 100755
index 0000000000..2444f8973f
--- /dev/null
+++ b/meta-telephony/recipes-osmocom/osmo-hlr/osmo-hlr/osmo-hlr.init
@@ -0,0 +1,48 @@
+!/bin/sh
+### BEGIN INIT INFO
+# Provides:		osmo-hlr
+# Required-Start:	$syslog $networking
+# Required-Stop:	$syslog
+# Default-Start:	5
+# Default-Stop:		1
+# Short-Description:	Osmocom HLR
+### END INIT INFO
+
+DAEMON=/usr/bin/osmo-hlr
+NAME=osmo-hlr
+DESC="Osmocom HLR"
+NORMAL_ARGS="-D -c /etc/osmocom/osmo-hlr.cfg -l /var/lib/osmocom/hlr.db"
+
+OSMOHLR_EXTRA_ARGS=""
+NO_START=1
+
+set -e
+
+test ! -r /etc/default/osmo-hlr || . /etc/default/osmo-hlr
+test "$NO_START" = "0" || exit 0
+test -x "$DAEMON" || exit 0
+
+case "$1" in
+  start)
+	echo -n "Starting $DESC: "
+	start-stop-daemon -S \
+	  -x "$DAEMON" -- $NORMAL_ARGS $OSMOHLR_EXTRA_ARGS
+	echo "$NAME."
+	;;
+  stop)
+	echo -n "Stopping $DESC: "
+	start-stop-daemon -K -x "$DAEMON"
+	echo "$NAME."
+	;;
+  restart|force-reload)
+	$0 stop
+	$0 start
+	;;
+  *)
+	N=/etc/init.d/$NAME
+	echo "Usage: $N {start|stop|restart}" >&2
+	exit 1
+	;;
+esac
+
+exit 0
diff --git a/meta-telephony/recipes-osmocom/osmo-hlr/osmo-hlr_git.bb b/meta-telephony/recipes-osmocom/osmo-hlr/osmo-hlr_git.bb
new file mode 100644
index 0000000000..b90d8443ff
--- /dev/null
+++ b/meta-telephony/recipes-osmocom/osmo-hlr/osmo-hlr_git.bb
@@ -0,0 +1,10 @@
+require ${PN}.inc
+
+PV = "0.1.0+gitr${SRCPV}"
+PRINC = "0"
+PR = "${INC_PR}.1"
+
+SRCREV = "63b7e86dcf552fb04eab8337c930ced6c970b3c8"
+SRC_URI += "git://git.osmocom.org/osmo-hlr.git;protocol=git"
+
+S = "${WORKDIR}/git/"
diff --git a/meta-telephony/recipes-osmocom/osmo-iuh/.osmo-msc_git.bb.swp b/meta-telephony/recipes-osmocom/osmo-iuh/.osmo-msc_git.bb.swp
new file mode 100644
index 0000000000..042d535390
Binary files /dev/null and b/meta-telephony/recipes-osmocom/osmo-iuh/.osmo-msc_git.bb.swp differ
diff --git a/meta-telephony/recipes-osmocom/osmo-iuh/osmo-iuh.inc b/meta-telephony/recipes-osmocom/osmo-iuh/osmo-iuh.inc
new file mode 100644
index 0000000000..ca0c563393
--- /dev/null
+++ b/meta-telephony/recipes-osmocom/osmo-iuh/osmo-iuh.inc
@@ -0,0 +1,56 @@
+DESCRIPTION = "OsmoHNBGW, libosmo-ranap"
+DEPENDS = "libosmocore libosmo-abis libosmo-netif libosmo-sccp libasn1c"
+HOMEPAGE = "http://osmocom.org/projects/cellular-infrastructure"
+LICENSE = "AGPLv3+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=73f1eb20517c55bf9493b7dd6e480788"
+
+SRC_URI = "file://osmo-hnbgw.init"
+
+INC_PR = "r1.${META_TELEPHONY_OSMO_INC}"
+
+#EXTRA_OECONF += " "
+
+inherit autotools update-rc.d pkgconfig
+
+# because "${WORKDIR}/git" is not a git repo, it can't figure out the version
+do_configure_prepend() {
+	echo "${PV}" > ${S}/.tarball-version
+}
+
+do_install_append() {
+	install -d ${D}${sysconfdir}/osmocom
+	install -m 0660 ${S}/doc/examples/osmo-hnbgw.cfg ${D}${sysconfdir}/osmocom/osmo-hnbgw.cfg
+
+	# Install sysv-init files
+	install -d ${D}${sysconfdir}/init.d
+	install -d ${D}${sysconfdir}/rc5.d
+	install -m 0775 ${WORKDIR}/osmo-hnbgw.init ${D}${sysconfdir}/init.d/osmo-hnbgw
+
+	# Install systemd files and enable on sysinit
+	install -d ${D}${systemd_unitdir}/system
+	for i in `ls ${S}/contrib/systemd`; do
+		install -m 0644 ${S}/contrib/systemd/$i ${D}${systemd_unitdir}/system/
+	done
+
+	install -d ${D}/var/lib/osmocom
+}
+
+PACKAGES =+ "osmo-hnbgw libosmo-ranap"
+
+INITSCRIPT_PACKAGES = "osmo-hnbgw"
+
+# Do not start any of the services by default
+SYSTEMD_AUTO_ENABLE = "disable"
+
+CONFFILES_osmo-hnbgw = "${sysconfdir}/osmocom/osmo-hnbgw.cfg"
+INITSCRIPT_NAME_osmo-hnbgw = "osmo-hnbgw"
+INITSCRIPT_PARAMS_osmo-hnbgw = "defaults 30 30"
+FILES_osmo-hnbgw = " ${bindir}/osmo-hnbgw \
+		/var/lib/osmocom \
+		${sysconfdir}/init.d/osmo-hnbgw \
+		${sysconfdir}/osmocom/osmo-hnbgw.cfg \
+		${systemd_unitdir}/system/osmo-hnbgw.service \
+		"
+
+# ?????
+FILES_libosmo-ranap = " ${libdir}/libosmo-ranap "
diff --git a/meta-telephony/recipes-osmocom/osmo-iuh/osmo-iuh/osmo-hnbgw.init b/meta-telephony/recipes-osmocom/osmo-iuh/osmo-iuh/osmo-hnbgw.init
new file mode 100755
index 0000000000..34c21fb650
--- /dev/null
+++ b/meta-telephony/recipes-osmocom/osmo-iuh/osmo-iuh/osmo-hnbgw.init
@@ -0,0 +1,48 @@
+!/bin/sh
+### BEGIN INIT INFO
+# Provides:		osmo-hnbgw
+# Required-Start:	$syslog $networking
+# Required-Stop:	$syslog
+# Default-Start:	5
+# Default-Stop:		1
+# Short-Description:	Osmocom HNBGW
+### END INIT INFO
+
+DAEMON=/usr/bin/osmo-hnbgw
+NAME=osmo-hnbgw
+DESC="Osmocom HNBGW"
+NORMAL_ARGS="-D -c /etc/osmocom/osmo-hnbgw.cfg"
+
+OSMOHNBGW_EXTRA_ARGS=""
+NO_START=1
+
+set -e
+
+test ! -r /etc/default/osmo-hnbgw || . /etc/default/osmo-hnbgw
+test "$NO_START" = "0" || exit 0
+test -x "$DAEMON" || exit 0
+
+case "$1" in
+  start)
+	echo -n "Starting $DESC: "
+	start-stop-daemon -S \
+	  -x "$DAEMON" -- $NORMAL_ARGS $OSMOHNBGW_EXTRA_ARGS
+	echo "$NAME."
+	;;
+  stop)
+	echo -n "Stopping $DESC: "
+	start-stop-daemon -K -x "$DAEMON"
+	echo "$NAME."
+	;;
+  restart|force-reload)
+	$0 stop
+	$0 start
+	;;
+  *)
+	N=/etc/init.d/$NAME
+	echo "Usage: $N {start|stop|restart}" >&2
+	exit 1
+	;;
+esac
+
+exit 0
diff --git a/meta-telephony/recipes-osmocom/osmo-iuh/osmo-iuh_git.bb b/meta-telephony/recipes-osmocom/osmo-iuh/osmo-iuh_git.bb
new file mode 100644
index 0000000000..6656c8401a
--- /dev/null
+++ b/meta-telephony/recipes-osmocom/osmo-iuh/osmo-iuh_git.bb
@@ -0,0 +1,10 @@
+require ${PN}.inc
+
+PV = "0.1.0+gitr${SRCPV}"
+PRINC = "0"
+PR = "${INC_PR}.1"
+
+SRCREV = "26531f9efc3a7366ef26e11855bc8ad46e9f8794"
+SRC_URI += "git://git.osmocom.org/osmo-iuh.git;protocol=git"
+
+S = "${WORKDIR}/git"
diff --git a/meta-telephony/recipes-osmocom/osmocom-3g/.osmo-msc_git.bb.swp b/meta-telephony/recipes-osmocom/osmocom-3g/.osmo-msc_git.bb.swp
new file mode 100644
index 0000000000..042d535390
Binary files /dev/null and b/meta-telephony/recipes-osmocom/osmocom-3g/.osmo-msc_git.bb.swp differ
diff --git a/meta-telephony/recipes-osmocom/osmocom-3g/osmocom-3g.inc b/meta-telephony/recipes-osmocom/osmocom-3g/osmocom-3g.inc
new file mode 100644
index 0000000000..87c110b2f4
--- /dev/null
+++ b/meta-telephony/recipes-osmocom/osmocom-3g/osmocom-3g.inc
@@ -0,0 +1,82 @@
+DESCRIPTION = "OsmoMSC, OsmoSGSN, OsmoMGCP"
+DEPENDS = "libdbi libosmocore libosmo-sccp libosmo-abis libosmo-netif openggsn libsmpp34 bcg729 libgsm libpcap c-ares libasn1c osmo-iuh"
+HOMEPAGE = "http://osmocom.org/projects/osmomsc"
+LICENSE = "AGPLv3+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=73f1eb20517c55bf9493b7dd6e480788"
+
+RDEPENDS_osmo-msc = "libdbd-sqlite3"
+
+SRC_URI = "file://osmo-msc.init \
+	   file://osmo-bsc_mgcp.init \
+	   file://osmo-sgsn.init"
+
+INC_PR = "r1.${META_TELEPHONY_OSMO_INC}"
+
+
+EXTRA_OECONF += " --enable-iu --enable-smpp --enable-mgcp-transcoding --with-g729"
+
+inherit autotools update-rc.d pkgconfig
+
+# because "${WORKDIR}/git" is not a git repo, it can't figure out the version
+do_configure_prepend() {
+	echo "${PV}" > ${S}/.tarball-version
+}
+
+do_install_append() {
+	install -d ${D}${sysconfdir}/osmocom
+	install -m 0660 ${S}/doc/examples/osmo-msc/osmo-msc.cfg ${D}${sysconfdir}/osmocom/osmo-msc.cfg
+	install -m 0660 ${S}/doc/examples/osmo-bsc_mgcp/mgcp.cfg ${D}${sysconfdir}/osmocom/osmo-bsc-mgcp.cfg
+	install -m 0660 ${S}/doc/examples/osmo-sgsn/osmo-sgsn.cfg ${D}${sysconfdir}/osmocom/osmo-sgsn.cfg
+
+	# Install sysv-init files
+	install -d ${D}${sysconfdir}/init.d
+	install -d ${D}${sysconfdir}/rc5.d
+	install -m 0775 ${WORKDIR}/osmo-msc.init ${D}${sysconfdir}/init.d/osmo-msc
+	install -m 0775 ${WORKDIR}/osmo-bsc_mgcp.init ${D}${sysconfdir}/init.d/osmo-bsc-mgcp
+	install -m 0775 ${WORKDIR}/osmo-sgsn.init ${D}${sysconfdir}/init.d/osmo-sgsn
+
+	# Install systemd files and enable on sysinit
+	install -d ${D}${systemd_unitdir}/system
+	install -m 0644 ${S}/contrib/systemd/osmo-msc.service ${D}${systemd_unitdir}/system/
+	install -m 0644 ${S}/contrib/systemd/osmo-sgsn.service ${D}${systemd_unitdir}/system/
+	install -m 0644 ${S}/contrib/systemd/osmo-bsc-mgcp.service ${D}${systemd_unitdir}/system/
+
+	install -d ${D}/var/lib/osmocom
+}
+
+PACKAGES =+ "osmo-msc osmo-sgsn osmo-bsc-mgcp ipaccess-utils"
+
+INITSCRIPT_PACKAGES = "osmo-msc osmo-sgsn osmo-bsc-mgcp"
+
+# Do not start any of the services by default
+SYSTEMD_AUTO_ENABLE = "disable"
+
+CONFFILES_osmo-msc = "${sysconfdir}/osmocom/osmo-msc.cfg"
+INITSCRIPT_NAME_osmo-msc = "osmo-msc"
+INITSCRIPT_PARAMS_osmo-msc = "defaults 30 30"
+FILES_osmo-msc = " ${bindir}/osmo-msc \
+		/var/lib/osmocom \
+		${sysconfdir}/init.d/osmo-msc \
+		${sysconfdir}/osmocom/osmo-msc.cfg \
+		${systemd_unitdir}/system/osmo-msc.service \
+		"
+
+CONFFILES_osmo-sgsn = "${sysconfdir}/osmocom/osmo-sgsn.cfg"
+INITSCRIPT_NAME_osmo-sgsn = "osmo-sgsn"
+INITSCRIPT_PARAMS_osmo-sgsn = "defaults 30 30"
+FILES_osmo-sgsn = " ${bindir}/osmo-sgsn \
+		${sysconfdir}/init.d/osmo-sgsn \
+		${sysconfdir}/osmocom/osmo-sgsn.cfg \
+		${systemd_unitdir}/system/osmo-sgsn.service \
+		"
+
+CONFFILES_osmo-bsc-mgcp = "${sysconfdir}/osmocom/osmo-bsc-mgcp.cfg"
+INITSCRIPT_NAME_osmo-bsc-mgcp = "osmo-bsc-mgcp"
+INITSCRIPT_PARAMS_osmo-bsc-mgcp = "defaults 30 30"
+FILES_osmo-bsc-mgcp = " ${bindir}/osmo-bsc_mgcp \
+		${sysconfdir}/osmocom/osmo-bsc-mgcp.cfg \
+		${sysconfdir}/init.d/osmo-bsc-mgcp \
+		${systemd_unitdir}/system/osmo-bsc-mgcp.service \
+		"
+
+FILES_ipaccess-utils = " ${bindir}/ipaccess-find ${bindir}/ipaccess-config ${bindir}/ipaccess-proxy "
diff --git a/meta-telephony/recipes-osmocom/osmocom-3g/osmocom-3g/osmo-bsc_mgcp.init b/meta-telephony/recipes-osmocom/osmocom-3g/osmocom-3g/osmo-bsc_mgcp.init
new file mode 100755
index 0000000000..058ec80c02
--- /dev/null
+++ b/meta-telephony/recipes-osmocom/osmocom-3g/osmocom-3g/osmo-bsc_mgcp.init
@@ -0,0 +1,48 @@
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides:		osmo-bsc_mgcp
+# Required-Start:	$syslog $networking
+# Required-Stop:	$syslog
+# Default-Start:	5
+# Default-Stop:		1
+# Short-Description:	Osmocom MGCP proxy
+### END INIT INFO
+
+DAEMON=/usr/bin/osmo-bsc_mgcp
+NAME=osmo-bsc_mgcp
+DESC="Osmocom MGCP proxy"
+NORMAL_ARGS="-D -c /etc/osmocom/osmo-bsc-mgcp.cfg"
+
+OSMOBSCMGCP_EXTRA_ARGS=""
+NO_START=1
+
+set -e
+
+test ! -r /etc/default/osmo-bsc_mgcp || . /etc/default/osmo-bsc_mgcp
+test "$NO_START" = "0" || exit 0
+test -x "$DAEMON" || exit 0
+
+case "$1" in
+  start)
+	echo -n "Starting $DESC: "
+	start-stop-daemon -S \
+	  -x "$DAEMON" -- $NORMAL_ARGS $OSMOBSCMGCP_EXTRA_ARGS
+	echo "$NAME."
+	;;
+  stop)
+	echo -n "Stopping $DESC: "
+	start-stop-daemon -K -x "$DAEMON"
+	echo "$NAME."
+	;;
+  restart)
+	$0 stop
+	$0 start
+	;;
+  *)
+	N=/etc/init.d/$NAME
+	echo "Usage: $N {start|stop|restart}" >&2
+	exit 1
+	;;
+esac
+
+exit 0
diff --git a/meta-telephony/recipes-osmocom/osmocom-3g/osmocom-3g/osmo-msc.init b/meta-telephony/recipes-osmocom/osmocom-3g/osmocom-3g/osmo-msc.init
new file mode 100755
index 0000000000..6369bbfe6d
--- /dev/null
+++ b/meta-telephony/recipes-osmocom/osmocom-3g/osmocom-3g/osmo-msc.init
@@ -0,0 +1,48 @@
+!/bin/sh
+### BEGIN INIT INFO
+# Provides:		osmo-msc
+# Required-Start:	$syslog $networking
+# Required-Stop:	$syslog
+# Default-Start:	5
+# Default-Stop:		1
+# Short-Description:	Osmocom MSC
+### END INIT INFO
+
+DAEMON=/usr/bin/osmo-msc
+NAME=osmo-msc
+DESC="Osmocom MSC"
+NORMAL_ARGS="-C -D -c /etc/osmocom/osmo-msc.cfg -l /var/lib/osmocom/sms.db"
+
+OSMOMSC_EXTRA_ARGS=""
+NO_START=1
+
+set -e
+
+test ! -r /etc/default/osmo-msc || . /etc/default/osmo-msc
+test "$NO_START" = "0" || exit 0
+test -x "$DAEMON" || exit 0
+
+case "$1" in
+  start)
+	echo -n "Starting $DESC: "
+	start-stop-daemon -S \
+	  -x "$DAEMON" -- $NORMAL_ARGS $OSMOMSC_EXTRA_ARGS
+	echo "$NAME."
+	;;
+  stop)
+	echo -n "Stopping $DESC: "
+	start-stop-daemon -K -x "$DAEMON"
+	echo "$NAME."
+	;;
+  restart|force-reload)
+	$0 stop
+	$0 start
+	;;
+  *)
+	N=/etc/init.d/$NAME
+	echo "Usage: $N {start|stop|restart}" >&2
+	exit 1
+	;;
+esac
+
+exit 0
diff --git a/meta-telephony/recipes-osmocom/osmocom-3g/osmocom-3g/osmo-sgsn.init b/meta-telephony/recipes-osmocom/osmocom-3g/osmocom-3g/osmo-sgsn.init
new file mode 100755
index 0000000000..44811351e1
--- /dev/null
+++ b/meta-telephony/recipes-osmocom/osmocom-3g/osmocom-3g/osmo-sgsn.init
@@ -0,0 +1,48 @@
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides:		osmo-sgsn
+# Required-Start:	$syslog $networking
+# Required-Stop:	$syslog
+# Default-Start:	5
+# Default-Stop:		1
+# Short-Description:	Osmocom Serving GPRS Support Node
+### END INIT INFO
+
+DAEMON=/usr/bin/osmo-sgsn
+NAME=osmo-sgsn
+DESC="Osmocom Serving GPRS Support Node"
+NORMAL_ARGS="-D -c /etc/osmocom/osmo-sgsn.cfg"
+
+OSMOSGSN_EXTRA_ARGS=""
+NO_START=0
+
+set -e
+
+test ! -r /etc/default/osmo-sgsn || . /etc/default/osmo-sgsn
+test "$NO_START" = "0" || exit 0
+test -x "$DAEMON" || exit 0
+
+case "$1" in
+  start)
+	echo -n "Starting $DESC: "
+	start-stop-daemon -S \
+	  -x "$DAEMON" -- $NORMAL_ARGS $OSMOSGSN_EXTRA_ARGS
+	echo "$NAME."
+	;;
+  stop)
+	echo -n "Stopping $DESC: "
+	start-stop-daemon -K -x "$DAEMON"
+	echo "$NAME."
+	;;
+  restart|force-reload)
+	$0 stop
+	$0 start
+	;;
+  *)
+	N=/etc/init.d/$NAME
+	echo "Usage: $N {start|stop|restart}" >&2
+	exit 1
+	;;
+esac
+
+exit 0
diff --git a/meta-telephony/recipes-osmocom/osmocom-3g/osmocom-3g_git.bb b/meta-telephony/recipes-osmocom/osmocom-3g/osmocom-3g_git.bb
new file mode 100644
index 0000000000..5ef833eedf
--- /dev/null
+++ b/meta-telephony/recipes-osmocom/osmocom-3g/osmocom-3g_git.bb
@@ -0,0 +1,11 @@
+require ${PN}.inc
+
+PV = "0.14.0+gitr${SRCPV}"
+PRINC = "0"
+PR = "${INC_PR}.6"
+
+# openbsc.git branch vlr_3G
+SRCREV = "bbd6127480f0d89ab1e1de9583555144ab68062d"
+SRC_URI += "git://git.osmocom.org/openbsc.git;protocol=git"
+
+S = "${WORKDIR}/git/openbsc"