diff --git a/data/init/gentoo/wicd b/data/init/gentoo/wicd
index a88bd3e..6260858 100755
--- a/data/init/gentoo/wicd
+++ b/data/init/gentoo/wicd
@@ -3,7 +3,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 WICD_DAEMON=/usr/bin/wicd
-WICD_PIDFILE=/run/wicd/wicd.pid
+WICD_PIDFILE=/run/wicd.pid
 
 depend() {
 	need dbus
diff --git a/setup.py b/setup.py
index 92add14..c504aba 100755
--- a/setup.py
+++ b/setup.py
@@ -224,6 +224,7 @@ class configure(setuptools.Command):
         elif self.distro in ['gentoo']:
             self.init = '/etc/init.d/'
             self.initfile = 'data/init/gentoo/wicd'
+            self.pidfile = '/run/wicd.pid'
         elif self.distro in ['pld']:
             self.init = '/etc/rc.d/init.d/'
             self.initfile = 'data/init/pld/wicd'