diff --git a/ext/debian/puppet.init b/ext/debian/puppet.init
index bba849907fc..e9234be35d9 100644
--- a/ext/debian/puppet.init
+++ b/ext/debian/puppet.init
@@ -14,7 +14,7 @@ DAEMON_OPTS=""
 NAME="agent"
 PROCNAME="puppet"
 DESC="puppet agent"
-PIDFILE="/var/run/puppet/${NAME}.pid"
+PIDFILE="/var/run/puppetlabs/${NAME}.pid"
 
 test -x $DAEMON || exit 0
 
diff --git a/ext/debian/puppetmaster.init b/ext/debian/puppetmaster.init
index d3dffac336b..145eebafee0 100644
--- a/ext/debian/puppetmaster.init
+++ b/ext/debian/puppetmaster.init
@@ -23,7 +23,7 @@ if [ ! -d /var/run/puppet ]; then
     mkdir -p /var/run/puppet
 fi
 
-chown puppet:puppet /var/run/puppet
+chown puppet:puppet /var/run/puppetlabs
 
 mongrel_warning="The mongrel servertype is no longer built-in to Puppet. It
 appears as though mongrel is being used, as the number of puppetmasters is
@@ -49,7 +49,7 @@ is_true() {
 
 start_puppet_master() {
     if is_true "$START" ; then
-        start-stop-daemon --start --quiet --pidfile /var/run/puppet/${NAME}.pid \
+        start-stop-daemon --start --quiet --pidfile /var/run/puppetlabs/${NAME}.pid \
             --startas $DAEMON -- $NAME $DAEMON_OPTS --masterport=$PORT
     else
         echo ""
@@ -58,7 +58,7 @@ start_puppet_master() {
 }
 
 stop_puppet_master() {
-    start-stop-daemon --stop --retry TERM/10/KILL/5 --quiet --oknodo --pidfile /var/run/puppet/${NAME}.pid
+    start-stop-daemon --stop --retry TERM/10/KILL/5 --quiet --oknodo --pidfile /var/run/puppetlabs/${NAME}.pid
 }
 
 status_puppet_master() {
@@ -96,11 +96,11 @@ status_puppet_master() {
     fi
 
     if is_true "$START" ; then
-        status_of_proc -p "/var/run/puppet/${NAME}.pid" "${DAEMON}" "${NAME}"
+        status_of_proc -p "/var/run/puppetlabs/${NAME}.pid" "${DAEMON}" "${NAME}"
     else
         echo ""
         echo "puppetmaster not configured to start"
-        status_of_proc -p "/var/run/puppet/${NAME}.pid" "${DAEMON}" "${NAME}"
+        status_of_proc -p "/var/run/puppetlabs/${NAME}.pid" "${DAEMON}" "${NAME}"
     fi
 }
 
diff --git a/ext/gentoo/conf.d/puppet b/ext/gentoo/conf.d/puppet
index e7e62574b0c..df8ccff6dd6 100644
--- a/ext/gentoo/conf.d/puppet
+++ b/ext/gentoo/conf.d/puppet
@@ -1,5 +1,5 @@
 # Location of PID files
-PUPPET_PID_DIR="/var/run/puppet"
+PUPPET_PID_DIR="/var/run/puppetlabs"
 
 # You may specify other parameters to the puppet client here
 #PUPPET_EXTRA_OPTS=""
diff --git a/ext/gentoo/conf.d/puppetmaster b/ext/gentoo/conf.d/puppetmaster
index 37b04d44da6..9f10e59f823 100644
--- a/ext/gentoo/conf.d/puppetmaster
+++ b/ext/gentoo/conf.d/puppetmaster
@@ -1,5 +1,5 @@
 # Location of PID files
-PUPPETMASTER_PID_DIR="/var/run/puppet"
+PUPPETMASTER_PID_DIR="/var/run/puppetlabs"
 
 # Location of the main manifest
 #PUPPETMASTER_MANIFEST="/etc/puppet/manifests/site.pp"
diff --git a/ext/redhat/client.init b/ext/redhat/client.init
index 7e93e564f39..265401caee8 100644
--- a/ext/redhat/client.init
+++ b/ext/redhat/client.init
@@ -18,7 +18,7 @@ export PATH
 
 [ -f /etc/sysconfig/puppet ] && . /etc/sysconfig/puppet
 lockfile=${LOCKFILE-/var/lock/subsys/puppet}
-pidfile=${PIDFILE-/var/run/puppet/agent.pid}
+pidfile=${PIDFILE-/var/run/puppetlabs/agent.pid}
 puppetd=${PUPPETD-/usr/bin/puppet}
 RETVAL=0
 
diff --git a/ext/redhat/server.init b/ext/redhat/server.init
index c34182b321d..73a51bfde0c 100644
--- a/ext/redhat/server.init
+++ b/ext/redhat/server.init
@@ -13,7 +13,7 @@ PATH=/usr/bin:/sbin:/bin:/usr/sbin
 export PATH
 
 lockfile=/var/lock/subsys/puppetmaster
-pidfile=/var/run/puppet/master.pid
+pidfile=/var/run/puppetlabs/master.pid
 
 # Source function library.
 . /etc/rc.d/init.d/functions
diff --git a/ext/solaris/smf/svc-puppetd b/ext/solaris/smf/svc-puppetd
index 8acc19cfa35..799fea83371 100755
--- a/ext/solaris/smf/svc-puppetd
+++ b/ext/solaris/smf/svc-puppetd
@@ -12,7 +12,7 @@ exec_prefix=/opt/csw
 sysconfdir=/opt/csw/etc
 sbindir=/opt/csw/sbin
 
-pidfile=/var/lib/puppet/run/agent.pid
+pidfile=/var/run/puppetlabs/agent.pid
 
 case "$1" in
 start)
diff --git a/ext/solaris/smf/svc-puppetmasterd b/ext/solaris/smf/svc-puppetmasterd
index 683324decc5..47e9c79973e 100755
--- a/ext/solaris/smf/svc-puppetmasterd
+++ b/ext/solaris/smf/svc-puppetmasterd
@@ -8,7 +8,7 @@ exec_prefix=/opt/csw
 sysconfdir=/opt/csw/etc
 sbindir=/opt/csw/sbin
 
-pidfile=/var/lib/puppet/run/master.pid
+pidfile=/var/run/puppetlabs/master.pid
 
 case "$1" in
 start)
diff --git a/ext/suse/client.init b/ext/suse/client.init
index e54f462f475..c111d7925fb 100644
--- a/ext/suse/client.init
+++ b/ext/suse/client.init
@@ -34,7 +34,7 @@
 [ -f /etc/rc.status ] && . /etc/rc.status
 [ -f /etc/sysconfig/puppet ] && . /etc/sysconfig/puppet
 lockfile=${LOCKFILE-/var/lock/subsys/puppet}
-pidfile=${PIDFILE-/var/run/puppet/agent.pid}
+pidfile=${PIDFILE-/var/run/puppetlabs/agent.pid}
 puppetd=${PUPPETD-/usr/bin/puppet}
 RETVAL=0
 
diff --git a/ext/suse/server.init b/ext/suse/server.init
index 632ab034ad7..e109469b295 100644
--- a/ext/suse/server.init
+++ b/ext/suse/server.init
@@ -31,7 +31,7 @@
 #      rc_exit          exit appropriate to overall rc status
 
 lockfile=/var/lock/subsys/puppetmaster
-pidfile=/var/run/puppet/master.pid
+pidfile=/var/run/puppetlabs/master.pid
 
 # Source function library.
 [ -f /etc/rc.status ] && . /etc/rc.status