diff --git a/mcp/pacemaker.service.in b/mcp/pacemaker.service.in
index e24a354329..fd6bebbe19 100644
--- a/mcp/pacemaker.service.in
+++ b/mcp/pacemaker.service.in
@@ -1,23 +1,41 @@
 [Unit]
 Description=Pacemaker High Availability Cluster Manager
 After=network.target
 Requires=network.target
 
 [Install]
 WantedBy=multi-user.target
 
 [Service]
 Type=simple
 KillMode=process
 NotifyAccess=main
 SysVStartPriority=99
 EnvironmentFile=-@sysconfdir@/sysconfig/pacemaker
 
 ExecStart=@sbindir@/pacemakerd -f
 
+# If pacemakerd doesn't stop, its probably waiting on a cluster
+# resource.  Sending -KILL will just get the node fenced
+SendSIGKILL=no
+
+# If we ever hit the StartLimitInterval/StartLimitBurst limit and the
+# admin wants to stop the cluster while pacemakerd is not running, it
+# might be a good idea to enable the ExecStopPost directive below.
+#
+# Although the node will likely end up being fenced as a result so its
+# not on by default
+#
+# ExecStopPost=killall -TERM crmd attrd fenced cib pengine lrmd
+
+# Uncomment this for older versions of systemd that didn't support
+# TimeoutStopSec
+# TimeoutSec=30min
+
 # Pacemaker can only exit after all managed services have shut down
 # A HA database could conceivably take even longer than this 
-TimeoutSec=30min
+TimeoutStopSec=30min
+TimeoutStartSec=60s
 
 # Restart options include: no, on-success, on-failure, on-abort or always
 Restart=on-failure