diff -Nru livecd-rootfs-2.301~ppa22/debian/changelog livecd-rootfs-2.301~ppa23/debian/changelog
--- livecd-rootfs-2.301~ppa22/debian/changelog	2015-09-15 15:39:02.000000000 +0200
+++ livecd-rootfs-2.301~ppa23/debian/changelog	2015-09-15 16:21:02.000000000 +0200
@@ -1,3 +1,10 @@
+livecd-rootfs (2.301~ppa23) vivid; urgency=medium
+
+  * ensure assets/ dir is correct and has no broken symlinks
+    or similar issues
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 15 Sep 2015 16:20:40 +0200
+
 livecd-rootfs (2.301~ppa22) vivid; urgency=medium
 
   * fix filename and test case for the former code...
diff -Nru livecd-rootfs-2.301~ppa22/live-build/ubuntu-core/hooks/500-move-kernel-to-device-tar.binary livecd-rootfs-2.301~ppa23/live-build/ubuntu-core/hooks/500-move-kernel-to-device-tar.binary
--- livecd-rootfs-2.301~ppa22/live-build/ubuntu-core/hooks/500-move-kernel-to-device-tar.binary	2015-08-26 13:15:13.000000000 +0200
+++ livecd-rootfs-2.301~ppa23/live-build/ubuntu-core/hooks/500-move-kernel-to-device-tar.binary	2015-09-15 16:19:50.000000000 +0200
@@ -25,35 +25,36 @@
  cp -ar --parent lib/firmware/ $TMPDIR/system/
 
  # new assets handling
- cp -ar boot/vmlinu?-* $TMPDIR/assets/vmlinuz
- cp -ar boot/initrd.img-* $TMPDIR/assets/initrd.img
- cp -ar boot/vmlinu?-* boot/initrd.img-* boot/abi-* boot/System.map-* $TMPDIR/assets/
+ if [ -f boot/vmlinu?-*.signed ]; then
+    kernel=boot/vmlinu?-*.signed
+ else
+    kernel=boot/vmlinu?-*
+ fi
 
- dtbs=$(find lib/firmware -type d -name 'device-tree' -print0)
- [ -n "$dtbs" ] && mv "$dtbs" $TMPDIR/assets/dtbs
+ initrd=boot/initrd.img-*
+
+ cp -ar $initrd $TMPDIR/assets/
+ cp -ar $kernel $TMPDIR/assets/
+ cp -ar boot/abi-* boot/System.map-* $TMPDIR/assets/
 
- if [ -e vmlinu? ] && [ -e initrd.img ]; then
-     cp -ar --parent vmlinu? initrd.img $TMPDIR/assets
+ dtbs=$(find lib/firmware -type d -name 'device-tree' -print0)
+ if [ -n "$dtbs" ]; then
+    mv "$dtbs" $TMPDIR/assets/dtbs
  fi
-)
-# create hardware.yaml for u-boot
-# this assumes armh == u-boot
-# and all others grub
-(
-# common bits
+
+ # create hardware.yaml
+ # this assumes armh == u-boot
+ # and all others grub
+ # common bits
  cat > $TMPDIR/hardware.yaml << EOF
-kernel: assets/vmlinuz
-initrd: assets/initrd.img
+kernel: assets/$(basename $kernel)
+initrd: assets/$(basename $initrd)
 partition-layout: system-AB
 EOF
 
 # arch specific ones
 if [ "$ARCH" = "armhf" ]; then
- vmlinuz_hash="$(md5sum $TMPDIR/assets/vmlinuz| cut -f1 -d\ )"
- initrd_hash="$(md5sum $TMPDIR/assets/initrd.img| cut -f1 -d\ )"
-
  cat >> $TMPDIR/hardware.yaml << EOF
-hashes: $vmlinuz_hash-$initrd_hash
 dtbs: assets/dtbs
 bootloader: u-boot
 EOF