--- /usr/portage/media-sound/mpd/files/mpd.rc6	2004-04-20 01:17:06.000000000 -0700
+++ /etc/init.d/mpd	2004-05-24 14:48:52.143319887 -0700
@@ -26,12 +26,12 @@
 
 	ebegin "Starting Music Player Daemon" 
 	start-stop-daemon --start --quiet --exec /usr/bin/mpd \
-		--pidfile /var/run/mpd --make-pidfile -- --no-create-db
+		-- --no-create-db
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping Music Player Daemon"
-	start-stop-daemon --stop --quiet --pidfile /var/run/mpd 
+	start-stop-daemon --stop --quiet --name mpd
 	eend $? 
 }