diff --git a/debian/changelog b/debian/changelog
index 62368f2c..dfaf11f3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,8 @@ livecd-rootfs (2.411) UNRELEASED; urgency=medium
 
   [ Adam Conrad ]
   * Stop explicitly removing systemd-sysv for touch.
+  * Move touch resolution hints to a HINTS variable, and adjust for use
+    on dual-stack gl/gles arches where things don't quite work right.
 
  -- Oliver Grawert <ogra@ubuntu.com>  Wed, 25 May 2016 14:26:07 +0200
 
diff --git a/live-build/auto/config b/live-build/auto/config
index 96238f8e..f49fafb3 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -413,7 +413,13 @@ case $PROJECT in
 		else
 			meta_package=ubuntu-pocket-desktop
 		fi
-		add_package install ubuntu-minimal $meta_package packagekit ubuntu-system-settings-online-accounts
+		HINTS="packagekit ubuntu-system-settings-online-accounts"
+		case $ARCH in
+		    amd64|i386)
+			HINTS="$HINTS qml-module-ubuntu-components-gles unity8"
+			;;
+		esac
+		add_package install ubuntu-minimal $meta_package $HINTS
 
 		COMPONENTS='main restricted universe'
 		BOOTAPPEND_LIVE='hostname=ubuntu-phablet username=ubuntu'