diff -Nru cgmanager-0.24/debian/cgmanager.cgmanager.upstart cgmanager-0.24/debian/cgmanager.cgmanager.upstart
--- cgmanager-0.24/debian/cgmanager.cgmanager.upstart	2014-04-04 22:25:26.000000000 +0000
+++ cgmanager-0.24/debian/cgmanager.cgmanager.upstart	2014-04-14 05:10:04.000000000 +0000
@@ -8,6 +8,7 @@
 # prior to saucy, we would need to start on mounted
 # MOUNTPOINT=/sys, and mount /sys/fs/cgroup ourselves
 start on mounted MOUNTPOINT=/sys/fs/cgroup or virtual-filesystems
+stop on runlevel [06]
 
 # to get debug output into /var/log/upstart/cgmanager.log, create/edit
 # /etc/default/cgmanager and set cgmanager_opts="--debug"
diff -Nru cgmanager-0.24/debian/cgmanager.cgproxy.upstart cgmanager-0.24/debian/cgmanager.cgproxy.upstart
--- cgmanager-0.24/debian/cgmanager.cgproxy.upstart	2014-04-04 22:57:11.000000000 +0000
+++ cgmanager-0.24/debian/cgmanager.cgproxy.upstart	2014-04-14 05:10:21.000000000 +0000
@@ -9,6 +9,7 @@
 # prior to saucy, we would need to start on mounted
 # MOUNTPOINT=/sys, and mount /sys/fs/cgroup ourselves
 start on started cgmanager
+stop on runlevel [06]
 
 # to get debug output into /var/log/upstart/cgproxy.log, create/edit
 # /etc/default/cgmanager and set cgmanager_opts="--debug"
diff -Nru cgmanager-0.24/debian/changelog cgmanager-0.24/debian/changelog
--- cgmanager-0.24/debian/changelog	2014-04-10 04:13:25.000000000 +0000
+++ cgmanager-0.24/debian/changelog	2014-04-14 05:14:11.000000000 +0000
@@ -1,3 +1,9 @@
+cgmanager (0.24-0ubuntu5) trusty; urgency=medium
+
+  * Add a 'stop on' to the upstart jobs (LP: #1307008)
+
+ -- Serge Hallyn <serge.hallyn@ubuntu.com>  Mon, 14 Apr 2014 00:13:44 -0500
+
 cgmanager (0.24-0ubuntu4) trusty; urgency=medium
 
   * debian/control: drop Vcs-Git field, which was pointing to the upstream