=== modified file 'live-build/auto/build'
--- live-build/auto/build	2016-04-12 17:24:25 +0000
+++ live-build/auto/build	2016-04-20 17:31:35 +0000
@@ -399,17 +399,20 @@
         HERE="$(pwd)"
         set -x
 
-        linux_package="linux-$devarch"
+        linux_package="linux-image-$devarch"
         case $ARCH in
             amd64)
-              linux_package="linux-signed-generic"
+              linux_package="linux-signed-image-generic"
               ;;
             arm64)
               if [ "$devarch" = "dragonboard" ]; then
-                  # ugly hack til we have a metapackage
-                  linux_package="linux-image-4.4.0-1009-snapdragon dragon410c-firmware"
+                  linux_package="linux-image-snapdragon linux-firmware-snapdragon"
               fi
               ;;
+            armhf)
+              if [ "$devarch" = "raspi2" ]; then
+                  linux_package="linux-image-raspi2 linux-firmware-raspi2"
+              ;;
             ppc64el|s390x)
               echo "I: skipping kernel and device tarball for $ARCH"
               return