diff --git a/debian/changelog b/debian/changelog
index ae7faac3..c1112adc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+livecd-rootfs (2.311) UNRELEASED; urgency=low
+
+  * live-build/ubuntu-core/hooks/500-move-kernel-to-device-tar.binary:
+    - ignore /vmlinu?, /initrd.img symlinks when building the boot assets
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 09 Jun 2015 09:46:41 +0200
+
 livecd-rootfs (2.311) wily; urgency=medium
 
   * Updates users and groups for desktop next
diff --git a/live-build/ubuntu-core/hooks/500-move-kernel-to-device-tar.binary b/live-build/ubuntu-core/hooks/500-move-kernel-to-device-tar.binary
index ed75ddc6..f6b77acf 100644
--- a/live-build/ubuntu-core/hooks/500-move-kernel-to-device-tar.binary
+++ b/live-build/ubuntu-core/hooks/500-move-kernel-to-device-tar.binary
@@ -25,18 +25,18 @@ mkdir -p $TMPDIR/assets/
  cp -ar --parent lib/firmware/ $TMPDIR/system/
 
  # new assets handling
+ # FIXME:
+ # - how to keep version information (and do we care)
  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/
+ cp -ar boot/abi-* boot/System.map-* $TMPDIR/assets/
 
  dtbs=$(find lib/firmware -type d -name 'device-tree' -print0)
- [ -n "$dtbs" ] && mv "$dtbs" $TMPDIR/assets/dtbs
-
- if [ -e vmlinu? ] && [ -e initrd.img ]; then
-     cp -ar --parent vmlinu? initrd.img $TMPDIR/assets
-     cp -ar --parent vmlinu? initrd.img $TMPDIR/assets
+ 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