diff --git a/packaging/debian-multiarch/sogo.init b/packaging/debian-multiarch/sogo.init
index 46f4168c6..500fb4853 100644
--- a/packaging/debian-multiarch/sogo.init
+++ b/packaging/debian-multiarch/sogo.init
@@ -71,17 +71,19 @@ case "$1" in
 	then
 	    log_progress_msg "already running"
         fi
-        chown root:root $PIDFILE
+	chown root:root $PIDFILE
 	log_end_msg 0
 	;;
   stop)
 	log_daemon_msg "Stopping $DESC" "$NAME"
 	start-stop-daemon -c $USER --stop --pidfile $PIDFILE --retry=TERM/20/KILL/5 --oknodo
+	rm -f $PIDFILE
 	log_end_msg 0
 	;;
   restart|force-reload)
 	log_daemon_msg "Restarting $DESC" "$NAME"
 	start-stop-daemon -c $USER --stop --pidfile $PIDFILE --retry=TERM/20/KILL/5 --oknodo
+	rm -f $PIDFILE
         # Ensure directory's existence and permissions
         install -o $USER -g adm -m 755 -d /var/run/$NAME
         install -o $USER -g adm -m 750 -d /var/spool/$NAME
diff --git a/packaging/debian/sogo.init b/packaging/debian/sogo.init
index 4539e4093..500fb4853 100644
--- a/packaging/debian/sogo.init
+++ b/packaging/debian/sogo.init
@@ -77,11 +77,13 @@ case "$1" in
   stop)
 	log_daemon_msg "Stopping $DESC" "$NAME"
 	start-stop-daemon -c $USER --stop --pidfile $PIDFILE --retry=TERM/20/KILL/5 --oknodo
+	rm -f $PIDFILE
 	log_end_msg 0
 	;;
   restart|force-reload)
 	log_daemon_msg "Restarting $DESC" "$NAME"
 	start-stop-daemon -c $USER --stop --pidfile $PIDFILE --retry=TERM/20/KILL/5 --oknodo
+	rm -f $PIDFILE
         # Ensure directory's existence and permissions
         install -o $USER -g adm -m 755 -d /var/run/$NAME
         install -o $USER -g adm -m 750 -d /var/spool/$NAME