diff --git a/bin/hwtr b/bin/hwtr
index 3da8ed33f10a1298472beacc091e1f895013dee5..f585d01926817b6f32ce7cbb0ab7b39a99c23c14 100755
--- a/bin/hwtr
+++ b/bin/hwtr
@@ -18,7 +18,7 @@ DESC="hwtr"
 SERVICE=$(basename -- "$0")
 NAME="${SERVICE##*.}"
 DAEMON=/usr/bin/pypcc-hwtr
-PIDFILE=/var/run/$NAME.pid
+PIDFILE=/var/run/$SERVICE.pid
 
 . /etc/init.d/functions || exit 1
 
@@ -33,7 +33,7 @@ PIDFILE=/var/run/$NAME.pid
 #
 do_start() {
   echo "Starting $DESC ..."
-  start-stop-daemon --start --background --pidfile $PIDFILE --make-pidfile --exec $DAEMON -- -p $HWTR_PORT -c $HWTR_CONFIG $HWTR_ARGS
+  start-stop-daemon -S -b -p $PIDFILE -m -x $DAEMON -- -p $HWTR_PORT -c $HWTR_CONFIG $HWTR_ARGS
 }
 
 #
@@ -41,7 +41,7 @@ do_start() {
 #
 do_stop() {
 	echo "Stopping $DESC"
-	start-stop-daemon --stop --pidfile $PIDFILE
+	start-stop-daemon -K -p $PIDFILE
 }
 
 case "$1" in