diff --git a/ChangeLog b/ChangeLog
index 9e4387ce72..701ea1582e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-04-26  Saleem Abdulrasool  <compnerd@compnerd.org>
+
+	* initscript/Gentoo/NetworkManager.in:
+		Fix for starting the daemon.
+
 2008-04-25  Dan Williams  <dcbw@redhat.com>
 
 	Patch from Benoit Boissinot <bboissin+networkmanager@gmail.com>
diff --git a/initscript/Gentoo/NetworkManager.in b/initscript/Gentoo/NetworkManager.in
index 9b23185b31..0af2f69c65 100755
--- a/initscript/Gentoo/NetworkManager.in
+++ b/initscript/Gentoo/NetworkManager.in
@@ -9,20 +9,15 @@ depend() {
 
 start() {
    ebegin "Starting NetworkManager"
-   start-stop-daemon --start --quiet --pidfile /var/run/NetworkManager.pid --exec /usr/sbin/NetworkManager
+   start-stop-daemon --start --quiet --pidfile /var/run/NetworkManager.pid \
+      --exec /usr/sbin/NetworkManager -- --pid-file /var/run/NetworkManager.pid
    eend $?
 }
 
 stop() {
-   local retval
-
    ebegin "Stopping NetworkManager"
    start-stop-daemon --stop --quiet --pidfile /var/run/NetworkManager.pid
-   retval=$?
-   eend ${retval}
-
-   [ -e /var/run/NetworkManager.pid ] && rm -f /var/run/NetworkManager.pid
-   return ${retval}
+   eend $?
 }
 
 # vim: set ft=gentoo-init-d ts=3 sw=3 et: