diff -Nru lxc-android-config-0.160/debian/changelog lxc-android-config-0.161/debian/changelog
--- lxc-android-config-0.160/debian/changelog	2014-04-06 09:39:42.000000000 -0400
+++ lxc-android-config-0.161/debian/changelog	2014-04-07 10:54:09.000000000 -0400
@@ -1,3 +1,9 @@
+lxc-android-config (0.161) UNRELEASED; urgency=medium
+
+  * Re-enable cgmanager support. (LP: #1302174)
+
+ -- Stéphane Graber <stgraber@ubuntu.com>  Mon, 07 Apr 2014 10:52:14 -0400
+
 lxc-android-config (0.160) trusty; urgency=medium
 
   [ Oliver Grawert ]
diff -Nru lxc-android-config-0.160/debian/control lxc-android-config-0.161/debian/control
--- lxc-android-config-0.160/debian/control	2014-04-04 09:16:59.000000000 -0400
+++ lxc-android-config-0.161/debian/control	2014-04-07 10:50:47.000000000 -0400
@@ -8,7 +8,7 @@
 Package: lxc-android-config
 Architecture: all
 Multi-Arch: foreign
-Depends: lxc (>= 1.0.0~beta1-0ubuntu1), cgroup-lite, debianutils, upstart, ${misc:Depends}
+Depends: lxc (>= 1.0.0~beta1-0ubuntu1), cgmanager, debianutils, upstart, ${misc:Depends}
 Breaks: ubuntu-touch-session (<< 0.107), powerd (<< 0.14-0ubuntu1)
 Recommends: ofono
 Description: configuration to fire up an ubuntu-touch android container
diff -Nru lxc-android-config-0.160/debian/lxc-android-config.upstart lxc-android-config-0.161/debian/lxc-android-config.upstart
--- lxc-android-config-0.160/debian/lxc-android-config.upstart	2014-04-04 09:12:43.000000000 -0400
+++ lxc-android-config-0.161/debian/lxc-android-config.upstart	2014-04-07 10:51:30.000000000 -0400
@@ -4,7 +4,7 @@
 
 description	"lxc android config and container initialization"
 
-start on started cgroup-lite
+start on cgmanager-ready
 stop on runlevel [06]
 
 emits android
@@ -16,7 +16,7 @@
 post-start script
     if [ ! -d /dev/cpuctl ] && [ -d /sys/fs/cgroup/cpu ]; then
         mkdir /dev/cpuctl
-        mount --bind /sys/fs/cgroup/cpu /dev/cpuctl
+        mount -t cgroup -o cpu none /sys/fs/cgroup/cpu
     fi
 
     lxc-wait -n android -s RUNNING -t 30
diff -Nru lxc-android-config-0.160/etc/init/cgmanager.override lxc-android-config-0.161/etc/init/cgmanager.override
--- lxc-android-config-0.160/etc/init/cgmanager.override	2014-04-04 09:13:32.000000000 -0400
+++ lxc-android-config-0.161/etc/init/cgmanager.override	1969-12-31 19:00:00.000000000 -0500
@@ -1 +0,0 @@
-manual
diff -Nru lxc-android-config-0.160/etc/init/cgproxy.override lxc-android-config-0.161/etc/init/cgproxy.override
--- lxc-android-config-0.160/etc/init/cgproxy.override	2014-04-04 09:13:37.000000000 -0400
+++ lxc-android-config-0.161/etc/init/cgproxy.override	1969-12-31 19:00:00.000000000 -0500
@@ -1 +0,0 @@
-manual