diff --git a/packaging/debian-multiarch/rules b/packaging/debian-multiarch/rules
index 085b092f0..fe8a66591 100755
--- a/packaging/debian-multiarch/rules
+++ b/packaging/debian-multiarch/rules
@@ -13,7 +13,7 @@ include /usr/share/GNUstep/Makefiles/common.make
 
 config.make: configure
 	dh_testdir
-	./configure --prefix=$(GNUSTEP_SYSTEM_ROOT) $(SAML2_CONFIG)
+	./configure $(SAML2_CONFIG)
 
 #Architecture
 build: build-arch
diff --git a/packaging/debian-multiarch/sogo.init b/packaging/debian-multiarch/sogo.init
index c296ba8b7..500fb4853 100644
--- a/packaging/debian-multiarch/sogo.init
+++ b/packaging/debian-multiarch/sogo.init
@@ -71,21 +71,25 @@ case "$1" in
 	then
 	    log_progress_msg "already running"
         fi
+	chown root:root $PIDFILE
 	log_end_msg 0
 	;;
   stop)
 	log_daemon_msg "Stopping $DESC" "$NAME"
-	start-stop-daemon --stop --pidfile $PIDFILE --retry=TERM/20/KILL/5 --oknodo
+	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 --stop --pidfile $PIDFILE --retry=TERM/20/KILL/5 --oknodo
+	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
         install -o $USER -g adm -m 750 -d /var/log/$NAME
 	start-stop-daemon -c $USER --quiet --start --pidfile $PIDFILE --exec $DAEMON -- $DAEMON_OPTS 
+	chown root:root $PIDFILE
 	log_end_msg 0
 	;;
   status)
diff --git a/packaging/debian/rules b/packaging/debian/rules
index 3792ee0f0..0b24231ac 100755
--- a/packaging/debian/rules
+++ b/packaging/debian/rules
@@ -15,7 +15,7 @@ include /usr/share/GNUstep/Makefiles/common.make
 
 config.make: configure
 	dh_testdir
-	./configure --prefix=$(GNUSTEP_SYSTEM_ROOT) $(SAML2_CONFIG)
+	./configure $(SAML2_CONFIG)
 
 #Architecture
 build: build-arch
diff --git a/packaging/debian/sogo.init b/packaging/debian/sogo.init
index c296ba8b7..500fb4853 100644
--- a/packaging/debian/sogo.init
+++ b/packaging/debian/sogo.init
@@ -71,21 +71,25 @@ case "$1" in
 	then
 	    log_progress_msg "already running"
         fi
+	chown root:root $PIDFILE
 	log_end_msg 0
 	;;
   stop)
 	log_daemon_msg "Stopping $DESC" "$NAME"
-	start-stop-daemon --stop --pidfile $PIDFILE --retry=TERM/20/KILL/5 --oknodo
+	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 --stop --pidfile $PIDFILE --retry=TERM/20/KILL/5 --oknodo
+	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
         install -o $USER -g adm -m 750 -d /var/log/$NAME
 	start-stop-daemon -c $USER --quiet --start --pidfile $PIDFILE --exec $DAEMON -- $DAEMON_OPTS 
+	chown root:root $PIDFILE
 	log_end_msg 0
 	;;
   status)