diff --git a/contrib/respawn-only.sh b/contrib/respawn-only.sh
index 66aaac79d..478abd666 100755
--- a/contrib/respawn-only.sh
+++ b/contrib/respawn-only.sh
@@ -3,6 +3,7 @@
 PID=$$
 echo "-1000" > /proc/$PID/oom_score_adj
 
+trap "{ kill 0; kill -2 0; }" EXIT
 
 while [ -f $1 ]; do
 	(echo "0" > /proc/self/oom_score_adj && exec nice -n -20 $*) &
diff --git a/contrib/respawn.sh b/contrib/respawn.sh
index 44e4fdc3c..196edadc0 100755
--- a/contrib/respawn.sh
+++ b/contrib/respawn.sh
@@ -3,6 +3,8 @@
 PID=$$
 echo "-1000" > /proc/$PID/oom_score_adj
 
+trap "kill 0" EXIT
+
 while [ -e /etc/passwd ]; do
 	cat /lib/firmware/sysmobts-v?.bit > /dev/fpgadl_par0
 	sleep 2s
diff --git a/contrib/sysmobts.init b/contrib/sysmobts.init
index 8b7b39bd7..2b9d28143 100755
--- a/contrib/sysmobts.init
+++ b/contrib/sysmobts.init
@@ -11,10 +11,10 @@
 
 case "$1" in
         start)
-		/usr/bin/screen -d -m -c /etc/osmocom/screenrc-sysmobts
+		/usr/bin/screen -d -m -c /etc/osmocom/screenrc-sysmobts -S sysmobts
                 ;;
 	stop)
-		echo "This script doesn't support stop"
+		/usr/bin/screen -d -r sysmobts -X quit
                 exit 1
 		;;
         restart|reload|force-reload)