diff --git a/debian/changelog b/debian/changelog
index 2af8c26b..e0a8d256 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+livecd-rootfs (2.407) xenial; urgency=medium
+
+  [ Colin Watson ]
+  * Add a basic build-time syntax check for live-build/auto/*.
+
+  [ Oliver Grawert ]
+  * add multiverse to sources.list for snappy kernel builds
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Thu, 21 Apr 2016 10:53:12 +0200
+
 livecd-rootfs (2.406) xenial; urgency=medium
 
   * Fix syntax error.
diff --git a/debian/rules b/debian/rules
index 24316ff0..5e853009 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,6 +4,12 @@
 
 DEB_HOST_MULTIARCH := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
+override_dh_auto_test:
+	dh_auto_test
+	set -e; for x in live-build/auto/*; do \
+		sh -n "$$x"; \
+	done
+
 override_dh_install:
 	dh_install
 	find debian/livecd-rootfs -type f -print0 | \
diff --git a/live-build/auto/config b/live-build/auto/config
index 27c8015a..c1e9d016 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -407,8 +407,8 @@ case $PROJECT in
 			# contains the framework definition
 			add_package install ubuntu-core-libs
 
-			# universe needed for 'system-image-cli'
-			COMPONENTS='main restricted universe'
+			# universe needed for 'system-image-cli' and multiverse for firmware
+			COMPONENTS='main restricted universe multiverse'
 		fi
 		OPTS="${OPTS:+$OPTS }--bootstrap-flavour=minimal"
 		;;