diff --git a/recipes-openmoko/openmoko-gsmd/files/cell-log b/recipes-openmoko/openmoko-gsmd/files/cell-log
index aa234240d2..cb913dd839 100644
--- a/recipes-openmoko/openmoko-gsmd/files/cell-log
+++ b/recipes-openmoko/openmoko-gsmd/files/cell-log
@@ -13,7 +13,7 @@ case "$1" in
     start)
         echo -n "Starting cell-log: "
         start-stop-daemon -S -b -p $PIDFILE \
-		-x /etc/gsmd-respawn.sh /usr/bin/cell_log
+		-x /usr/bin/osmo-service-respawn.sh /usr/bin/cell_log
 
         if [ $? = 0 ]; then
             echo "cell-log"
diff --git a/recipes-openmoko/openmoko-gsmd/files/gsmd b/recipes-openmoko/openmoko-gsmd/files/gsmd
index 35017164b2..d6ac135c09 100644
--- a/recipes-openmoko/openmoko-gsmd/files/gsmd
+++ b/recipes-openmoko/openmoko-gsmd/files/gsmd
@@ -21,7 +21,7 @@ case "$1" in
 
         echo -n "Starting GSM daemon: "
         start-stop-daemon -S -p $PIDFILE -b \
-		-x /etc/gsmd-respawn.sh /usr/sbin/gsmd -- gsmd -p $GSM_DEV $GSMD_OPTS -l syslog
+		-x /usr/bin/osmo-service-respawn.sh /usr/sbin/gsmd -- gsmd -p $GSM_DEV $GSMD_OPTS -l syslog
 
         if [ $? = 0 ]; then
             echo "gsmd."
diff --git a/recipes-openmoko/openmoko-gsmd/files/gsmd-respawn.sh b/recipes-openmoko/openmoko-gsmd/files/gsmd-respawn.sh
deleted file mode 100644
index df40ac0a91..0000000000
--- a/recipes-openmoko/openmoko-gsmd/files/gsmd-respawn.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env bash
-
-NAME=`basename $1`
-PIDFILE="/var/run/$NAME.pid"
-PID=$$
-echo "$PID" > $PIDFILE
-echo "-1000" > /proc/$PID/oom_score_adj
-
-trap "{ rm -f $PIDFILE ; kill 0; }" EXIT
-
-while true;
-do
-	echo "Restarting not dealing well with spaces.."
-	(echo "0" > /proc/self/oom_score_adj && exec $*) &
-	LAST_PID=$!
-	wait $LAST_PID
-	sleep 10s
-done
-
diff --git a/recipes-openmoko/openmoko-gsmd/openmoko-gsmd_git.bb b/recipes-openmoko/openmoko-gsmd/openmoko-gsmd_git.bb
index b2aab057f9..d198e52596 100644
--- a/recipes-openmoko/openmoko-gsmd/openmoko-gsmd_git.bb
+++ b/recipes-openmoko/openmoko-gsmd/openmoko-gsmd_git.bb
@@ -11,12 +11,11 @@ SRC_URI = "git://git.gnumonks.org/openmoko-gsmd.git;branch=master \
 	   file://cell-log.patch \
            file://gsmd \
            file://cell-log \
-           file://gsmd-respawn.sh \
            file://default"
 SRCREV = "da770f8f34662a298647a75698a718705047d3dc"
 S = "${WORKDIR}/git"
 
-PR = "r13.0"
+PR = "r14.0"
 
 inherit autotools pkgconfig update-rc.d
 
@@ -37,7 +36,6 @@ do_install_append() {
 	install -m 0755 ${WORKDIR}/cell-log ${D}/${sysconfdir}/init.d/
 	install -d ${D}/${sysconfdir}/default
 	install ${WORKDIR}/default ${D}/${sysconfdir}/default/gsmd
-	install -m 0755 ${WORKDIR}/gsmd-respawn.sh ${D}/${sysconfdir}/
 }
 
 PACKAGES =+ "\
@@ -69,8 +67,8 @@ RDEPENDS_${PN}-plugins = "\
   ${PN}-plugin-vendor-wavecom \
 "
 
-RDEPENDS_${PN} += "update-rc.d"
-RDEPENDS_${PN}-tools-cell-log += "update-rc.d ${PN}"
+RDEPENDS_${PN} += "update-rc.d osmo-service-respawn"
+RDEPENDS_${PN}-tools-cell-log += "update-rc.d ${PN} osmo-service-respawn"
 
 FILES_${PN}-dbg += "${libdir}/gsmd/.debug/*"
 FILES_${PN}-tools-cell-log = "${bindir}/cell_log ${sysconfdir}/cell-log"