--- a/base/univention-base-files/conffiles/etc/init.d/cron	
+++ a/base/univention-base-files/conffiles/etc/init.d/cron	
@@ -2,6 +2,7 @@ 
 @%@UCRWARNING=# @%@
 # Start/stop the cron daemon.
 #
+# pidfile: /var/run/crond.pid
 ### BEGIN INIT INFO
 # Provides:          cron
 # Required-Start:    $remote_fs $syslog $time
--- a/base/univention-base-files/conffiles/etc/init.d/nscd	
+++ a/base/univention-base-files/conffiles/etc/init.d/nscd	
@@ -1,5 +1,6 @@ 
 #!/bin/sh
 @%@UCRWARNING=# @%@
+# pidfile: /var/run/nscd/nscd.pid
 ### BEGIN INIT INFO
 # Provides:          nscd
 # Required-Start:    $remote_fs $syslog
--- a/base/univention-base-files/conffiles/etc/init.d/ntp	
+++ a/base/univention-base-files/conffiles/etc/init.d/ntp	
@@ -1,6 +1,7 @@ 
 #!/bin/sh
 @%@UCRWARNING=# @%@
 
+# pidfile: /var/run/ntpd.pid
 ### BEGIN INIT INFO
 # Provides:        ntp
 # Required-Start:  $network $remote_fs $syslog
--- a/base/univention-base-files/conffiles/etc/init.d/openbsd-inetd	
+++ a/base/univention-base-files/conffiles/etc/init.d/openbsd-inetd	
@@ -1,6 +1,7 @@ 
 #!/bin/sh -e
 @%@UCRWARNING=# @%@
 
+# pidfile: /var/run/inetd.pid
 ### BEGIN INIT INFO
 # Provides:          openbsd-inetd
 # Required-Start:    $local_fs $remote_fs
--- a/base/univention-base-files/conffiles/etc/init.d/rpcbind	
+++ a/base/univention-base-files/conffiles/etc/init.d/rpcbind	
@@ -3,6 +3,7 @@ 
 #
 # start/stop rpcbind daemon.
 
+# pidfile: /run/rpcbind.pid
 ### BEGIN INIT INFO
 # Provides:          rpcbind
 # Required-Start:    $network $local_fs
--- a/base/univention-bootsplash/debian/univention-welcome-screen.init	
+++ a/base/univention-bootsplash/debian/univention-welcome-screen.init	
@@ -1,4 +1,5 @@ 
 #!/bin/bash
+# pidfile: /var/run/univention-welcome-screen.pid
 ### BEGIN INIT INFO
 # Provides:          univention-welcome-screen
 # Required-Start:    $local_fs
--- a/base/univention-heimdal/conffiles/etc/init.d/heimdal-kdc	
+++ a/base/univention-heimdal/conffiles/etc/init.d/heimdal-kdc	
@@ -2,6 +2,7 @@ 
 
 @%@UCRWARNING=# @%@
 
+# pidfile: /var/run/heimdal-kdc.pid
 ### BEGIN INIT INFO
 # Provides:          heimdal-kdc
 # Required-Start:    $remote_fs $syslog
--- a/base/univention-runit/debian/univention-runit.init	
+++ a/base/univention-runit/debian/univention-runit.init	
@@ -1,4 +1,5 @@ 
 #!/bin/sh
+# pidfile: /var/run/univention-runit.pid
 ### BEGIN INIT INFO
 # Provides:          univention-runit
 # Required-Start:    $local_fs
@@ -39,27 +40,28 @@ 
 NAME='univention-runit'
 DESC=$(get_lsb_header_val "$0" Short-Description)
 DAEMON="/usr/sbin/runsvdir-start"
+PIDFILE='/var/run/univention-runit.pid'
 
 case "$1" in
 	start)
 		log_daemon_msg "Starting $DESC" "$NAME"
-		start-stop-daemon --start --background --exec "$DAEMON"
+		start-stop-daemon --start --quiet --oknodo --pidfile "$PIDFILE" --make-pidfile --background --exec "$DAEMON"
 		log_end_msg $?
 		;;
 	stop)
 		log_daemon_msg "Stopping $DESC" "$NAME"
-		killall -s HUP runsvdir
+		start-stop-daemon --stop --quiet --oknodo --pidfile "$PIDFILE" --remove-pidfile --retry HUP/30/KILL/5 --name runsvdir
 		log_end_msg $?
 		;;
 	restart|force-reload)
 		log_daemon_msg "Restarting $DESC" "$NAME"
-		killall -s HUP runsvdir
+		start-stop-daemon --stop --quiet --oknodo --pidfile "$PIDFILE" --remove-pidfile --retry HUP/30/KILL/5 --name runsvdir
 		sleep 1
-		start-stop-daemon --start --background --exec "$DAEMON"
+		start-stop-daemon --start --quiet --pidfile "$PIDFILE" --make-pidfile --background --exec "$DAEMON"
 		log_end_msg $?
 		;;
 	status)
-		status_of_proc "$DAEMON" "$DESC"
+		status_of_proc -p "$PIDFILE" "$DAEMON" "$DESC"
 		;;
 	*)
 		echo "Usage: $0 {start|stop|restart|force-reload|status}"
--- a/container/univention-docker/conffiles/etc/init.d/docker	
+++ a/container/univention-docker/conffiles/etc/init.d/docker	
@@ -1,6 +1,7 @@ 
 #!/bin/sh
 @%@UCRWARNING=# @%@
 
+# pidfile: /var/run/docker.pid
 ### BEGIN INIT INFO
 # Provides:           docker
 # Required-Start:     $syslog $remote_fs
--- a/doc/developer-reference/ucr/service/conffiles/etc/init.d/atd	
+++ a/doc/developer-reference/ucr/service/conffiles/etc/init.d/atd	
@@ -1,5 +1,6 @@ 
 #! /bin/sh
 @%@UCRWARNING=# @%@
+# pidfile: /var/run/atd.pid
 ### BEGIN INIT INFO
 # Provides:          atd
 # Required-Start:    $syslog $time $remote_fs
--- a/mail/univention-mail-dovecot/conffiles/etc/init.d/dovecot	
+++ a/mail/univention-mail-dovecot/conffiles/etc/init.d/dovecot	
@@ -1,6 +1,7 @@ 
 #! /bin/sh
 @%@UCRWARNING=# @%@
 
+# pidfile: /var/run/dovecot/master.pid
 ### BEGIN INIT INFO
 # Provides:          dovecot
 # Required-Start:    $local_fs $remote_fs $network $syslog $time
--- a/mail/univention-mail-postfix/conffiles/etc/init.d/postfix	
+++ a/mail/univention-mail-postfix/conffiles/etc/init.d/postfix	
@@ -7,6 +7,7 @@ 
 # LaMont Jones <lamont@debian.org>
 # based on sendmail's init.d script
 
+# pidfile: /var/spool/postfix/pid/master.pid
 ### BEGIN INIT INFO
 # Provides:          postfix mail-transport-agent
 # Required-Start:    $local_fs $remote_fs $syslog $named $network $time
--- a/mail/univention-postgrey/conffiles/etc/init.d/postgrey	
+++ a/mail/univention-postgrey/conffiles/etc/init.d/postgrey	
@@ -41,6 +41,7 @@ 
 #
 # Version:      $Id: postgrey.init 1436 2006-12-07 07:15:03Z avbidder $
 #
+# pidfile: /var/run/postgrey.pid
 ### BEGIN INIT INFO
 # Provides:          postgrey
 # Required-Start:    $syslog $local_fs $remote_fs
--- a/management/univention-management-console/debian/univention-management-console-server.init	
+++ a/management/univention-management-console/debian/univention-management-console-server.init	
@@ -1,4 +1,5 @@ 
 #!/bin/sh
+# pidfile: /var/run/umc-server.pid
 ### BEGIN INIT INFO
 # Provides:          univention-management-console-server
 # Required-Start:    $network $remote_fs
--- a/management/univention-management-console/debian/univention-management-console-web-server.init	
+++ a/management/univention-management-console/debian/univention-management-console-web-server.init	
@@ -1,4 +1,5 @@ 
 #!/bin/sh
+# pidfile: /var/run/umc-web-server.pid
 ### BEGIN INIT INFO
 # Provides:          univention-management-console-web-server
 # Required-Start:    $network $remote_fs univention-management-console-server
--- a/nagios/univention-nagios/conffiles/etc/init.d/nagios-nrpe-server	
+++ a/nagios/univention-nagios/conffiles/etc/init.d/nagios-nrpe-server	
@@ -1,7 +1,7 @@ 
 #! /bin/sh
-#
 @%@UCRWARNING=# @%@
 
+# pidfile: /var/run/nagios/nrpe.pid
 ### BEGIN INIT INFO
 # Provides:          nagios-nrpe-server
 # Required-Start:    $local_fs $remote_fs $syslog $named $network $time
--- a/nagios/univention-nagios/conffiles/etc/init.d/nagios3	
+++ a/nagios/univention-nagios/conffiles/etc/init.d/nagios3	
@@ -8,6 +8,7 @@ 
 #		Nagios version by Sean Finney <seanius@debian.org> and probably others
 #		nagios2 version by Marc Haber <mh+debian-packages@zugschlus.de>
 
+# pidfile: /var/run/nagios3/nagios3.pid
 ### BEGIN INIT INFO
 # Provides:          nagios3
 # Required-Start:    $local_fs $remote_fs $syslog $named $network $time
--- a/services/univention-ad-connector/debian/univention-ad-connector.init	
+++ a/services/univention-ad-connector/debian/univention-ad-connector.init	
@@ -1,4 +1,5 @@ 
 #!/bin/sh
+# pidfile: /var/run/univention-ad-connector
 ### BEGIN INIT INFO
 # Provides:          univention-ad-connector
 # Required-Start:    $network $remote_fs slapd
--- a/services/univention-net-installer/debian/univention-net-installer-daemon.init.d	
+++ a/services/univention-net-installer/debian/univention-net-installer-daemon.init.d	
@@ -29,6 +29,7 @@ 
 # /usr/share/common-licenses/AGPL-3; if not, see
 # <http://www.gnu.org/licenses/>.
 #
+# pidfile: /var/run/univention-net-installer-daemon.pid
 ### BEGIN INIT INFO
 # Provides:          univention-net-installer-daemon
 # Required-Start:    $network $local_fs
--- a/services/univention-s4-connector/debian/univention-s4-connector.init	
+++ a/services/univention-s4-connector/debian/univention-s4-connector.init	
@@ -1,4 +1,5 @@ 
 #!/bin/sh
+# pidfile: /var/run/univention-s4-connector
 ### BEGIN INIT INFO
 # Provides:          univention-s4-connector
 # Required-Start:    $network $remote_fs slapd samba-ad-dc
--- a/services/univention-samba/conffiles/etc/init.d/samba	
+++ a/services/univention-samba/conffiles/etc/init.d/samba	
@@ -4,6 +4,7 @@ 
 # Written by Debian Samba Maintainers <pkg-samba-maint@lists.alioth.debian.org>
 # Modified for UCS by Univention <packages@univention.de>
 
+# pidfile: /var/run/samba/smbd.pid
 ### BEGIN INIT INFO
 # Provides:          samba
 # Required-Start:    $network $local_fs $remote_fs
--- a/virtualization/univention-novnc/debian/univention-novnc.init	
+++ a/virtualization/univention-novnc/debian/univention-novnc.init	
@@ -1,4 +1,5 @@ 
 #!/bin/sh
+# pidfile: /var/run/univention-novnc.pid
 ### BEGIN INIT INFO
 # Provides:          univention-novnc
 # Required-Start:    $network $local_fs