diff --git a/mcp/pacemaker.combined.upstart.in b/mcp/pacemaker.combined.upstart.in
index 6f0e39ae82..9e30e1c4e7 100644
--- a/mcp/pacemaker.combined.upstart.in
+++ b/mcp/pacemaker.combined.upstart.in
@@ -1,69 +1,69 @@
 # pacemaker-corosync - High-Availability cluster
 #
 # Starts Corosync cluster engine and Pacemaker cluster manager.
 
 # if you use automatic start, uncomment the line below.
 #start on started local and runlevel [2345]
 
 stop on runlevel [0123456]
 kill timeout 3600
 respawn
 
 env prog=pacemakerd
-env sysconf=@CONFIGDIR@/crm_mon
+env sysconf=@CONFIGDIR@/pacemaker
 env rpm_lockdir=@localstatedir@/lock/subsys
 env deb_lockdir=@localstatedir@/lock
 
 script
     [ -f "$sysconf" ] && . "$sysconf"
     exec $prog
 end script
 
 pre-start script
     # setup the software watchdog which corosync uses.
     # rewrite according to environment.
     [ -c /dev/watchdog ] || modprobe softdog soft_margin=60
     pidof corosync || start corosync
 
     # if you use corosync-notifyd, uncomment the line below.
     #start corosync-notifyd
 
     # give it time to fail.
     sleep 2
     pidof corosync || { exit 1; }
 
     # if you use crm_mon, uncomment the line below.
     #start crm_mon
 end script
 
 post-start script
     [ -f "$sysconf" ] && . "$sysconf"
     [ -z "$LOCK_FILE" -a -d "$rpm_lockdir" ] && LOCK_FILE="$rpm_lockdir/pacemaker"
     [ -z "$LOCK_FILE" -a -d "$deb_lockdir" ] && LOCK_FILE="$deb_lockdir/pacemaker"
     touch "$LOCK_FILE"
     pidof $prog > "@localstatedir@/run/$prog.pid"
 end script
 
 post-stop script
     [ -f "$sysconf" ] && . "$sysconf"
     [ -z "$LOCK_FILE" -a -d "$rpm_lockdir" ] && LOCK_FILE="$rpm_lockdir/pacemaker"
     [ -z "$LOCK_FILE" -a -d "$deb_lockdir" ] && LOCK_FILE="$deb_lockdir/pacemaker"
     rm -f "$LOCK_FILE"
     rm -f "@localstatedir@/run/$prog.pid"
 
     # if you use watchdog of corosync, uncomment the line below.
     #pidof corosync || false
 
     pidof crmd || stop corosync
 
     # if you want to reboot a machine by watchdog of corosync when
     # pacemakerd disappeared unexpectedly, uncomment the line below
     # and invalidate above "respawn" stanza.
     #pidof crmd && killall -q -9 corosync
 
     # if you use crm_mon, uncomment the line below.
     #stop crm_mon
 
     # if you use corosync-notifyd, uncomment the line below.
     #stop corosync-notifyd || true
 end script
diff --git a/mcp/pacemaker.upstart.in b/mcp/pacemaker.upstart.in
index 9ac3fd664d..7a54bc0ea8 100644
--- a/mcp/pacemaker.upstart.in
+++ b/mcp/pacemaker.upstart.in
@@ -1,33 +1,33 @@
 # pacemaker - High-Availability cluster resource manager
 #
 # Starts pacemakerd
 
 stop on runlevel [0123456]
 kill timeout 3600
 respawn
 
 env prog=pacemakerd
-env sysconf=@CONFIGDIR@/crm_mon
+env sysconf=@CONFIGDIR@/pacemaker
 env rpm_lockdir=@localstatedir@/lock/subsys
 env deb_lockdir=@localstatedir@/lock
 
 script
     [ -f "$sysconf" ] && . "$sysconf"
     exec $prog
 end script
 
 post-start script
     [ -f "$sysconf" ] && . "$sysconf"
     [ -z "$LOCK_FILE" -a -d "$rpm_lockdir" ] && LOCK_FILE="$rpm_lockdir/pacemaker"
     [ -z "$LOCK_FILE" -a -d "$deb_lockdir" ] && LOCK_FILE="$deb_lockdir/pacemaker"
     touch "$LOCK_FILE"
     pidof $prog > "@localstatedir@/run/$prog.pid"
 end script
 
 post-stop script
     [ -f "$sysconf" ] && . "$sysconf"
     [ -z "$LOCK_FILE" -a -d "$rpm_lockdir" ] && LOCK_FILE="$rpm_lockdir/pacemaker"
     [ -z "$LOCK_FILE" -a -d "$deb_lockdir" ] && LOCK_FILE="$deb_lockdir/pacemaker"
     rm -f "$LOCK_FILE"
     rm -f "@localstatedir@/run/$prog.pid"
 end script