diff --git a/debian/changelog b/debian/changelog
index d103fbdd..4ca6379b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,24 @@
+livecd-rootfs (2.411) yakkety; urgency=medium
+
+  [ Michael Vogt ]
+  * update kernel snap building to match the new kernel policy
+  * system-image: add /usr/local/bin/xdg-open dbus helper
+
+  [ Oliver Grawert ]
+  * add u-boot-tools to all snappy arches
+  * drop flash-kernel from snappy, it is useless there
+  * create /boot/uboot dir on all arches and configure /etc/fw_env.config
+    everywhere
+  * adjust motd message on snappy (capitalize "Snappy Ubuntu Core" and replace
+    the "snappy --help" with "snap --help"
+
+  [ 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.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Thu, 26 May 2016 21:05:28 -0600
+
 livecd-rootfs (2.410) yakkety; urgency=medium
 
   * Rename old ubuntu-core tarballs to ubuntu-base to avoid confusion.
diff --git a/live-build/auto/build b/live-build/auto/build
index 6d0f05a7..cb40d4f8 100755
--- a/live-build/auto/build
+++ b/live-build/auto/build
@@ -451,8 +451,16 @@ case $PROJECT:$SUBPROJECT in
         mkdir -p $TMPDIR/assets/
 
         cd chroot
-        cp -ar --parent lib/modules/ $TMPDIR/system/
-        cp -ar --parent lib/firmware/ $TMPDIR/system/
+        cp -ar lib/modules/ $TMPDIR/system/
+        cp -ar lib/firmware/ $TMPDIR/system/
+        # FIXME: compat with the old kernel spec/old initramfs that
+        #        expects lib/{modules,firmware}
+        # 
+        # FIXME2: update the initramfs-tools-ubuntu-core scripts/ubuntu-core
+        #         to look at the new location        
+        mkdir $TMPDIR/system/lib
+        ln -s $TMPDIR/system/modules $TMPDIR/system/lib
+        ln -s $TMPDIR/system/firmware $TMPDIR/system/lib
 
         # new assets handling
         if [ -f boot/vmlinu?-*.signed ]; then
@@ -562,8 +570,11 @@ EOF
         cd $HERE/snap
         kernel="$(ls vmlinuz-*)"
         initrd="$(ls initrd.img-*)"
+        # old kernel spec
         ln -s $kernel vmlinuz
         ln -s $initrd initrd.img
+        # new kernel spec
+        ln -s $kernel kernel.img
         kvers="$(ls vmlinuz-*|sed 's/^.*vmlinuz-//;s/-[a-z.]*$//')"
 
         VERSION=$kvers+$(date +20%y%m%d.%H-%M)
diff --git a/live-build/auto/config b/live-build/auto/config
index 0621058b..f49fafb3 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -362,6 +362,8 @@ case $PROJECT in
 		# no Task: header yet
 		add_package install snapd
 		add_package install ubuntu-core-snapd-units
+                # we want all arches to have u-boot-tools
+                add_package install u-boot-tools
 
 		# no minimal as we want to be really minimal
 		#add_task install minimal
@@ -390,12 +392,6 @@ case $PROJECT in
 				add_package install grub-efi-amd64-signed
 				add_package install shim-signed
 				;;
-			armhf)
-				add_package install flash-kernel u-boot-tools
-				;;
-			arm64)
-				add_package install u-boot-tools
-                                ;;
 		esac
 		OPTS="${OPTS:+$OPTS }--linux-packages=none --initramfs=none --initramfs-compression=none"
 
@@ -417,7 +413,13 @@ case $PROJECT in
 		else
 			meta_package=ubuntu-pocket-desktop
 		fi
-		add_package install ubuntu-minimal $meta_package systemd-sysv- 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'
diff --git a/live-build/ubuntu-core/hooks/14-set-motd.chroot b/live-build/ubuntu-core/hooks/14-set-motd.chroot
index 206a57db..cd89d365 100644
--- a/live-build/ubuntu-core/hooks/14-set-motd.chroot
+++ b/live-build/ubuntu-core/hooks/14-set-motd.chroot
@@ -1,12 +1,12 @@
 #!/bin/sh
 
 cat >/etc/motd<<EOF
-Welcome to snappy Ubuntu Core, a transactionally updated Ubuntu.
+Welcome to Snappy Ubuntu Core, a transactionally updated Ubuntu.
 
  * See https://ubuntu.com/snappy
 
-It's a brave new world here in snappy Ubuntu Core! This machine
-does not use apt-get or deb packages. Please see 'snappy --help'
+It's a brave new world here in Snappy Ubuntu Core! This machine
+does not use apt-get or deb packages. Please see 'snap --help'
 for app installation and transactional updates.
 
 EOF
diff --git a/live-build/ubuntu-core/hooks/16-ensure-uboot.chroot b/live-build/ubuntu-core/hooks/16-ensure-uboot.chroot
index 4a9a5c91..5a3b3ef7 100644
--- a/live-build/ubuntu-core/hooks/16-ensure-uboot.chroot
+++ b/live-build/ubuntu-core/hooks/16-ensure-uboot.chroot
@@ -2,10 +2,8 @@
 
 set -e
 
-case "$(dpkg --print-architecture)" in
-    arm*)
-        mkdir -p /boot/uboot
-        cat > /etc/fw_env.config <<EOF
+mkdir -p /boot/uboot
+cat > /etc/fw_env.config <<EOF
 # snappy u-boot env config
 # its crucial that we have the two entries here
 #   u-boot/tools/env/fw_env.c 
@@ -16,5 +14,3 @@ case "$(dpkg --print-architecture)" in
 /boot/uboot/uboot.env 0x0000 0x20000
 /boot/uboot/uboot.env 0x0000 0x20000
 EOF
-        ;;
-esac
diff --git a/live-build/ubuntu-core/hooks/500-create-xdg-wrapper b/live-build/ubuntu-core/hooks/500-create-xdg-wrapper
new file mode 100644
index 00000000..f6b480fe
--- /dev/null
+++ b/live-build/ubuntu-core/hooks/500-create-xdg-wrapper
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+set -ex
+
+echo "I: Creating xdg helper"
+
+PREFIX=binary/boot/filesystem.dir
+
+mkdir -p $PREFIX/usr/local/bin
+cat >$PREFIX/usr/local/bin/xdg-open <<EOF
+#!/bin/sh
+cat <<'EOF'
+dbus-send --print-reply --session --dest=com.canonical.SafeLauncher / com.canonical.SafeLauncher.OpenURL string:"$1"
+EOF
+chmod 755 $PREFIX/usr/local/bin/xdg-open
+