diff --git a/pbs-mom.service b/pbs-mom.service
index e37aeba..269f5e8 100644
--- a/pbs-mom.service
+++ b/pbs-mom.service
@@ -5,6 +5,7 @@ After=syslog.target network.target trqauthd.service
 [Service]
 Type=forking
 ExecStart=/usr/sbin/pbs_mom
+PIDFile=/var/lib/torque/mom_priv/mom.lock
 
 [Install]
 WantedBy=multi-user.target
diff --git a/pbs-sched.service b/pbs-sched.service
index d1bd0e0..2f4f355 100644
--- a/pbs-sched.service
+++ b/pbs-sched.service
@@ -5,6 +5,7 @@ After=syslog.target network.target trqauthd.service
 [Service]
 Type=forking
 ExecStart=/usr/sbin/pbs_sched
+PIDFile=/var/lib/torque/sched_priv/sched.lock
 
 [Install]
 WantedBy=multi-user.target
diff --git a/pbs-server.service b/pbs-server.service
index 7040a91..5ce8e1b 100644
--- a/pbs-server.service
+++ b/pbs-server.service
@@ -5,6 +5,7 @@ After=syslog.target network.target trqauthd.service
 [Service]
 Type=forking
 ExecStart=/usr/sbin/pbs_server
+PIDFile=/var/lib/torque/server_priv/server.lock
 
 [Install]
 WantedBy=multi-user.target
diff --git a/torque.spec b/torque.spec
index 79a4e7a..762fbfd 100644
--- a/torque.spec
+++ b/torque.spec
@@ -623,6 +623,7 @@ fi
 %dir %{torquehomedir} 
 %dir %{torquehomedir}/aux
 %attr (1777,root,root) %{torquehomedir}/spool
+%attr (1777,root,root) %{torquehomedir}/undelivered
 %dir %{torquehomedir}/spool
 %dir %{torquehomedir}/undelivered
 %{torquehomedir}/checkpoint