diff --git a/debian/changelog b/debian/changelog
index 3a6ad516..37566c3c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,8 @@ debian-cd (3.1.17-jessie) UNRELEASED; urgency=medium
     + Check for file size on update CD/DVD generation
     + parse_isolinux: Support grub menuentry shortcuts for UEFI boot menus.
       Closes: #798908
+    + Add firmware bundles in cpio.gz format too to help netboot users
+    + Create checksums for firmware images
 
  -- Steve McIntyre <93sam@debian.org>  Mon, 20 Apr 2015 12:36:57 +0100
 
diff --git a/tools/make-firmware-image b/tools/make-firmware-image
index 501bec22..9ddf0dbc 100755
--- a/tools/make-firmware-image
+++ b/tools/make-firmware-image
@@ -39,4 +39,11 @@ cd $TMPDIR/firmware
 tar czf ../firmware.tar.gz .
 zip -9rq ../firmware.zip .
 cd ..
-ls -l $PWD/firmware.tar.gz $PWD/firmware.zip
+find firmware | cpio --quiet -o -H newc | gzip -9 > firmware.cpio.gz
+ls -l $PWD/firmware.cpio.gz $PWD/firmware.tar.gz $PWD/firmware.zip
+
+cd firmware
+md5sum firmware* > MD5SUMS
+sha1sum firmware* > SHA1SUMS
+sha256sum firmware* > SHA256SUMS
+sha512sum firmware* > SHA512SUMS