diff --git a/daemon/libvirtd.init.in b/daemon/libvirtd.init.in
index 0697a2b692f41ef1020cd81ceda21b58758d0d84..4e610cb231aa07dd990bf81de6ef66797b64e586 100644
--- a/daemon/libvirtd.init.in
+++ b/daemon/libvirtd.init.in
@@ -74,7 +74,6 @@ stop() {
     echo
     if [ $RETVAL -eq 0 ]; then
         rm -f @localstatedir@/lock/subsys/$SERVICE
-        rm -f $PIDFILE
         rm -rf @localstatedir@/cache/libvirt/*
     else
         exit $RETVAL
diff --git a/daemon/libvirtd.upstart b/daemon/libvirtd.upstart
index fd1d95181533f2622dc92127f2149d56c42da57c..f51701aa6cfdecbe90031b113d26f6a871e712af 100644
--- a/daemon/libvirtd.upstart
+++ b/daemon/libvirtd.upstart
@@ -31,9 +31,6 @@ script
         ulimit -c "$DAEMON_COREFILE_LIMIT"
     fi
 
-    # Clean up a pidfile that might be left around
-    rm -f /var/run/libvirtd.pid
-
     mkdir -p /var/cache/libvirt
     rm -rf /var/cache/libvirt/*
 
@@ -41,6 +38,5 @@ script
 end script
 
 post-stop script
-    rm -f $PIDFILE
     rm -rf /var/cache/libvirt/*
 end script