Index: slurm-slurm-16-05-8-1/etc/slurmctld.service.in
===================================================================
--- slurm-slurm-16-05-8-1.orig/etc/slurmctld.service.in
+++ slurm-slurm-16-05-8-1/etc/slurmctld.service.in
@@ -8,7 +8,7 @@ Type=forking
 EnvironmentFile=-/etc/sysconfig/slurmctld
 ExecStart=@sbindir@/slurmctld $SLURMCTLD_OPTIONS
 ExecReload=/bin/kill -HUP $MAINPID
-PIDFile=/var/run/slurmctld.pid
+PIDFile=/var/run/slurm/slurmctld.pid
 
 [Install]
 WantedBy=multi-user.target
Index: slurm-slurm-16-05-8-1/etc/slurmd.service.in
===================================================================
--- slurm-slurm-16-05-8-1.orig/etc/slurmd.service.in
+++ slurm-slurm-16-05-8-1/etc/slurmd.service.in
@@ -8,7 +8,7 @@ Type=forking
 EnvironmentFile=-/etc/sysconfig/slurmd
 ExecStart=@sbindir@/slurmd $SLURMD_OPTIONS
 ExecReload=/bin/kill -HUP $MAINPID
-PIDFile=/var/run/slurmd.pid
+PIDFile=/var/run/slurm/slurmd.pid
 KillMode=process
 LimitNOFILE=51200
 LimitMEMLOCK=infinity
Index: slurm-slurm-16-05-8-1/etc/slurmdbd.service.in
===================================================================
--- slurm-slurm-16-05-8-1.orig/etc/slurmdbd.service.in
+++ slurm-slurm-16-05-8-1/etc/slurmdbd.service.in
@@ -8,7 +8,7 @@ Type=forking
 EnvironmentFile=-/etc/sysconfig/slurmdbd
 ExecStart=@sbindir@/slurmdbd $SLURMDBD_OPTIONS
 ExecReload=/bin/kill -HUP $MAINPID
-PIDFile=/var/run/slurmdbd.pid
+PIDFile=/var/run/slurm/slurmdbd.pid
 
 [Install]
 WantedBy=multi-user.target