diff --git a/debian/changelog b/debian/changelog
index 021df2bd..e9ba035a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+livecd-rootfs (2.210) UNRELEASED; urgency=medium
+
+  * live-build/ubuntu-touch/hooks/70-reconfigure-autopilot.chroot: Fix test
+    for whether a package is installed, and check for both python-autopilot
+    and python3-autopilot.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Fri, 16 May 2014 13:03:31 +0100
+
 livecd-rootfs (2.209) utopic; urgency=medium
 
   * live-build/auto/config: Pass any additional command-line arguments on to
diff --git a/live-build/ubuntu-touch/hooks/70-reconfigure-autopilot.chroot b/live-build/ubuntu-touch/hooks/70-reconfigure-autopilot.chroot
index 0e28394e..296fec0f 100644
--- a/live-build/ubuntu-touch/hooks/70-reconfigure-autopilot.chroot
+++ b/live-build/ubuntu-touch/hooks/70-reconfigure-autopilot.chroot
@@ -7,4 +7,10 @@
 
 echo "making sure phablet user is in the autopilot group"
 
-dpkg -l python-autopilot >/dev/null 2>&1 && dpkg-reconfigure python-autopilot
+for pkg in python-autopilot python3-autopilot; do
+	if dpkg-query -W -f '${Status}\n' "$pkg" 2>/dev/null | \
+	   grep -q ' installed$'; then
+		dpkg-reconfigure "$pkg"
+		break
+	fi
+done