diff --git a/mcp/pacemaker.service.in b/mcp/pacemaker.service.in
index b089bda509..27ea4e5b4e 100644
--- a/mcp/pacemaker.service.in
+++ b/mcp/pacemaker.service.in
@@ -1,27 +1,26 @@
 [Unit]
 Description=Pacemaker High Availability Cluster Manager
 After=syslog.target network.target
 Requires=syslog.target network.target
 
 [Install]
 WantedBy=multi-user.target
 
 [Service]
-Type=simple
-KillMode=main
+Type=forming
+KillMode=process
 NotifyAccess=main
 SysVStartPriority=99
-GuessMainPID=forking
 EnvironmentFile=@sysconfdir@/sysconfig/pacemaker
 
 WorkingDirectory=@CRM_STATE_DIR@
 ExecStart=@sbindir@/pacemakerd
 ExecStop=/bin/kill -TERM $MAINPID
 
 
 # Pacemaker can only exit after all managed services have shut down
 # A HA database could conceivably take even longer than this 
 TimeoutSec=30min
 
 # Restart options include: no, on-success, on-failure, on-abort or always
 Restart=on-failure