--- git-daemon.initd	2008-09-16 19:05:58.000000000 +0100
+++ /etc/init.d/git-daemon	2008-09-22 21:10:52.000000000 +0100
@@ -3,6 +3,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-util/git/files/git-daemon.initd,v 1.3 2008/09/16 17:52:15 robbat2 Exp $
 
+PIDFILE=${PIDFILE:-/var/run/git-daemon.pid}
+
 depend() {
 	need net
 	use logger
@@ -10,13 +12,14 @@
 
 start() {
 	ebegin "Starting git-daemon"
-		start-stop-daemon --start --quiet --background \
-		--exec /usr/bin/git -- daemon ${GITDAEMON_OPTS}
+	start-stop-daemon --start --background \
+		--exec /usr/bin/git --pidfile "${PIDFILE}" \
+		-- daemon --pid-file="${PIDFILE}" ${GITDAEMON_OPTS}
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping git-daemon"
-		start-stop-daemon --stop --quiet --name git-daemon
+	start-stop-daemon --stop --pidfile "${PIDFILE}"
 	eend $?
 }