diff --git a/meta-telephony/recipes-osmocom/osmo-iuh/osmo-iuh.inc b/meta-telephony/recipes-osmocom/osmo-iuh/osmo-iuh.inc
index ca0c563393..f1ce1ea2c1 100644
--- a/meta-telephony/recipes-osmocom/osmo-iuh/osmo-iuh.inc
+++ b/meta-telephony/recipes-osmocom/osmo-iuh/osmo-iuh.inc
@@ -4,7 +4,8 @@ HOMEPAGE = "http://osmocom.org/projects/cellular-infrastructure"
 LICENSE = "AGPLv3+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=73f1eb20517c55bf9493b7dd6e480788"
 
-SRC_URI = "file://osmo-hnbgw.init"
+SRC_URI = "file://osmo-hnbgw.init \
+	   file://osmo-hnbgw.service"
 
 INC_PR = "r1.${META_TELEPHONY_OSMO_INC}"
 
@@ -32,6 +33,8 @@ do_install_append() {
 		install -m 0644 ${S}/contrib/systemd/$i ${D}${systemd_unitdir}/system/
 	done
 
+	install -m 0644 ${WORKDIR}/osmo-hnbgw.service ${D}${systemd_unitdir}/system/
+
 	install -d ${D}/var/lib/osmocom
 }
 
diff --git a/meta-telephony/recipes-osmocom/osmo-iuh/osmo-iuh/osmo-hnbgw.service b/meta-telephony/recipes-osmocom/osmo-iuh/osmo-iuh/osmo-hnbgw.service
new file mode 100644
index 0000000000..13517fb90e
--- /dev/null
+++ b/meta-telephony/recipes-osmocom/osmo-iuh/osmo-iuh/osmo-hnbgw.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=Osmocom Home Nodeb Gateway (OsmoHNBGW)
+After=osmo-msc.service
+Wants=osmo-msc.service 
+After=osmo-sgsn.service
+Wants=osmo-sgsn.service
+
+[Service]
+Type=simple
+Restart=always
+ExecStartPre=/bin/sleep 5
+ExecStart=/usr/bin/osmo-hnbgw -c /etc/osmocom/osmo-hnbgw.cfg
+RestartSec=2
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta-telephony/recipes-osmocom/osmo-iuh/osmo-iuh_git.bb b/meta-telephony/recipes-osmocom/osmo-iuh/osmo-iuh_git.bb
index 6656c8401a..1ae0314e87 100644
--- a/meta-telephony/recipes-osmocom/osmo-iuh/osmo-iuh_git.bb
+++ b/meta-telephony/recipes-osmocom/osmo-iuh/osmo-iuh_git.bb
@@ -2,7 +2,7 @@ require ${PN}.inc
 
 PV = "0.1.0+gitr${SRCPV}"
 PRINC = "0"
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.2"
 
 SRCREV = "26531f9efc3a7366ef26e11855bc8ad46e9f8794"
 SRC_URI += "git://git.osmocom.org/osmo-iuh.git;protocol=git"
diff --git a/meta-telephony/recipes-osmocom/osmocom-3g/osmocom-3g.inc b/meta-telephony/recipes-osmocom/osmocom-3g/osmocom-3g.inc
index 87c110b2f4..956d05c27a 100644
--- a/meta-telephony/recipes-osmocom/osmocom-3g/osmocom-3g.inc
+++ b/meta-telephony/recipes-osmocom/osmocom-3g/osmocom-3g.inc
@@ -10,7 +10,7 @@ SRC_URI = "file://osmo-msc.init \
 	   file://osmo-bsc_mgcp.init \
 	   file://osmo-sgsn.init"
 
-INC_PR = "r1.${META_TELEPHONY_OSMO_INC}"
+INC_PR = "r2.${META_TELEPHONY_OSMO_INC}"
 
 
 EXTRA_OECONF += " --enable-iu --enable-smpp --enable-mgcp-transcoding --with-g729"
@@ -37,9 +37,9 @@ do_install_append() {
 
 	# 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 -m 0644 ${WORKDIR}/osmo-msc.service ${D}${systemd_unitdir}/system/
+	install -m 0644 ${WORKDIR}/osmo-sgsn.service ${D}${systemd_unitdir}/system/
+	install -m 0644 ${WORKDIR}/osmo-bsc-mgcp.service ${D}${systemd_unitdir}/system/
 
 	install -d ${D}/var/lib/osmocom
 }
diff --git a/meta-telephony/recipes-osmocom/osmocom-3g/osmocom-3g/osmo-bsc-mgcp.service b/meta-telephony/recipes-osmocom/osmocom-3g/osmocom-3g/osmo-bsc-mgcp.service
new file mode 100644
index 0000000000..b1277d59b0
--- /dev/null
+++ b/meta-telephony/recipes-osmocom/osmocom-3g/osmocom-3g/osmo-bsc-mgcp.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=OpenBSC MGCP
+After=networking.service
+
+[Service]
+Type=simple
+Restart=always
+ExecStart=/usr/bin/osmo-bsc_mgcp -s -c /etc/osmocom/osmo-bsc-mgcp.cfg
+RestartSec=2
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta-telephony/recipes-osmocom/osmocom-3g/osmocom-3g/osmo-msc.service b/meta-telephony/recipes-osmocom/osmocom-3g/osmocom-3g/osmo-msc.service
new file mode 100644
index 0000000000..53e83e8e63
--- /dev/null
+++ b/meta-telephony/recipes-osmocom/osmocom-3g/osmocom-3g/osmo-msc.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=Osmocom Mobile Switching Center (MSC)
+Wants=osmo-hlr.service
+After=osmo-hlr.service
+After=networking.service
+
+[Service]
+Type=simple
+Restart=always
+ExecStart=/usr/bin/osmo-msc -c /etc/osmocom/osmo-msc.cfg
+RestartSec=2
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta-telephony/recipes-osmocom/osmocom-3g/osmocom-3g/osmo-sgsn.service b/meta-telephony/recipes-osmocom/osmocom-3g/osmocom-3g/osmo-sgsn.service
new file mode 100644
index 0000000000..0641e5775c
--- /dev/null
+++ b/meta-telephony/recipes-osmocom/osmocom-3g/osmocom-3g/osmo-sgsn.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=OpenBSC SGSN
+Wants=osmo-hlr.service
+After=osmo-hlr.service
+After=networking.service
+
+[Service]
+Type=simple
+Restart=always
+ExecStart=/usr/bin/osmo-sgsn -c /etc/osmocom/osmo-sgsn.cfg
+RestartSec=2
+
+[Install]
+WantedBy=multi-user.target