diff --git a/debian/changelog b/debian/changelog
index d103fbdd..08588a1a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+livecd-rootfs (2.411) UNRELEASED; urgency=medium
+
+  * update kernel snap building to match the new kernel policy
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 10 May 2016 18:16:56 -0700
+
 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)