diff -Nru linux-signed-4.2.0/debian/changelog linux-signed-4.2.0/debian/changelog
--- linux-signed-4.2.0/debian/changelog	2015-09-29 21:46:36.000000000 +0100
+++ linux-signed-4.2.0/debian/changelog	2015-09-30 11:09:53.000000000 +0100
@@ -1,3 +1,14 @@
+linux-signed (4.2.0-13.15+signed2) wily; urgency=low
+
+  * move linux-signed linux-image-extra-* dependencies over to linux-meta.
+    (LP: #1501235)
+  * allow us to configure which flavours produce a udeb of the signed
+    kernel.
+  * switch downloads to build phase to prevent us downloading the kernel
+    binaries twice during build.
+
+ -- Andy Whitcroft <apw@canonical.com>  Wed, 30 Sep 2015 09:52:07 +0100
+
 linux-signed (4.2.0-13.15) wily; urgency=low
 
   [ Andy Whitcroft ]
diff -Nru linux-signed-4.2.0/debian/control linux-signed-4.2.0/debian/control
--- linux-signed-4.2.0/debian/control	2015-09-29 21:47:27.000000000 +0100
+++ linux-signed-4.2.0/debian/control	2015-09-30 11:09:59.000000000 +0100
@@ -7,40 +7,28 @@
 
 Package: linux-signed-image-4.2.0-13-generic
 Architecture: linux-amd64
-Depends: ${misc:Depends}, sbsigntool, linux-image-4.2.0-13-generic (= 4.2.0-13.15), linux-image-extra-4.2.0-13-generic (= 4.2.0-13.15)
+Depends: ${misc:Depends}, sbsigntool, linux-image-4.2.0-13-generic (= 4.2.0-13.15)
 Built-Using: linux (= ${linux:Version})
 Description: Signed kernel image generic
  A kernel image for generic.  This version of it is signed with
  Canonical's UEFI signing key.
 
-Package: kernel-signed-image-4.2.0-13-generic-di
-Package-Type: udeb
-Section: debian-installer
-Priority: extra
-Provides: kernel-signed-image
-Architecture: linux-amd64
-Built-Using: linux (= ${linux:Version})
-Description: Signed kernel image generic for the Debian installer
- A kernel image for generic.  This version of it is signed with
- Canonical's UEFI signing key.  It is intended for the Debian installer,
- it does _not_ provide a usable kernel for your full Debian system.
-
 Package: linux-signed-image-4.2.0-13-lowlatency
 Architecture: linux-amd64
-Depends: ${misc:Depends}, sbsigntool, linux-image-4.2.0-13-lowlatency (= 4.2.0-13.15), linux-image-extra-4.2.0-13-lowlatency (= 4.2.0-13.15)
+Depends: ${misc:Depends}, sbsigntool, linux-image-4.2.0-13-lowlatency (= 4.2.0-13.15)
 Built-Using: linux (= ${linux:Version})
 Description: Signed kernel image lowlatency
  A kernel image for lowlatency.  This version of it is signed with
  Canonical's UEFI signing key.
 
-Package: kernel-signed-image-4.2.0-13-lowlatency-di
+Package: kernel-signed-image-4.2.0-13-generic-di
 Package-Type: udeb
 Section: debian-installer
 Priority: extra
 Provides: kernel-signed-image
 Architecture: linux-amd64
 Built-Using: linux (= ${linux:Version})
-Description: Signed kernel image lowlatency for the Debian installer
- A kernel image for lowlatency.  This version of it is signed with
+Description: Signed kernel image generic for the Debian installer
+ A kernel image for generic.  This version of it is signed with
  Canonical's UEFI signing key.  It is intended for the Debian installer,
  it does _not_ provide a usable kernel for your full Debian system.
diff -Nru linux-signed-4.2.0/debian/flavour.stub linux-signed-4.2.0/debian/flavour.stub
--- linux-signed-4.2.0/debian/flavour.stub	2015-06-12 16:24:29.000000000 +0100
+++ linux-signed-4.2.0/debian/flavour.stub	2015-09-30 10:14:29.000000000 +0100
@@ -1,20 +1,8 @@
 
 Package: linux-signed-image-ABI-FLAVOUR
 Architecture: linux-amd64
-Depends: ${misc:Depends}, sbsigntool, linux-image-ABI-FLAVOUR (= VERSION), linux-image-extra-ABI-FLAVOUR (= VERSION)
+Depends: ${misc:Depends}, sbsigntool, linux-image-ABI-FLAVOUR (= VERSION)
 Built-Using: linux (= ${linux:Version})
 Description: Signed kernel image FLAVOUR
  A kernel image for FLAVOUR.  This version of it is signed with
  Canonical's UEFI signing key.
-
-Package: kernel-signed-image-ABI-FLAVOUR-di
-Package-Type: udeb
-Section: debian-installer
-Priority: extra
-Provides: kernel-signed-image
-Architecture: linux-amd64
-Built-Using: linux (= ${linux:Version})
-Description: Signed kernel image FLAVOUR for the Debian installer
- A kernel image for FLAVOUR.  This version of it is signed with
- Canonical's UEFI signing key.  It is intended for the Debian installer,
- it does _not_ provide a usable kernel for your full Debian system.
diff -Nru linux-signed-4.2.0/debian/flavour-udeb.stub linux-signed-4.2.0/debian/flavour-udeb.stub
--- linux-signed-4.2.0/debian/flavour-udeb.stub	1970-01-01 01:00:00.000000000 +0100
+++ linux-signed-4.2.0/debian/flavour-udeb.stub	2015-09-30 10:14:34.000000000 +0100
@@ -0,0 +1,12 @@
+
+Package: kernel-signed-image-ABI-FLAVOUR-di
+Package-Type: udeb
+Section: debian-installer
+Priority: extra
+Provides: kernel-signed-image
+Architecture: linux-amd64
+Built-Using: linux (= ${linux:Version})
+Description: Signed kernel image FLAVOUR for the Debian installer
+ A kernel image for FLAVOUR.  This version of it is signed with
+ Canonical's UEFI signing key.  It is intended for the Debian installer,
+ it does _not_ provide a usable kernel for your full Debian system.
diff -Nru linux-signed-4.2.0/debian/rules linux-signed-4.2.0/debian/rules
--- linux-signed-4.2.0/debian/rules	2015-09-29 21:39:11.000000000 +0100
+++ linux-signed-4.2.0/debian/rules	2015-09-30 10:45:02.000000000 +0100
@@ -12,7 +12,9 @@
 src_abi = $(shell echo "$(src_version)" | sed -ne 's/\([0-9]*\.[0-9]*\.[0-9]*\-[0-9]*\)\..*/\1/p')
 
 # Flavours in the master package.
+# NOTE: flavours must be a superset of udeb_flavours.
 flavours = generic lowlatency
+udeb_flavours = generic
 
 flavour_first = $(firstword $(flavours))
 binaries = $(foreach flavour,$(flavours),linux-image-$(src_abi)-$(flavour) \(>= $(src_version)\), )
@@ -26,6 +28,10 @@
 			sed <debian/flavour.stub			\
 				-e "s/FLAVOUR/$$flavour/g";		\
 		done;							\
+		for flavour in $(udeb_flavours); do			\
+			sed <debian/flavour-udeb.stub			\
+				-e "s/FLAVOUR/$$flavour/g";		\
+		done;							\
 	} | sed >debian/control						\
 		-e "s/ABI/$(src_abi)/g"					\
 		-e "s/BINARIES/$(binaries)/g" 				\
@@ -35,27 +41,27 @@
 		debian/linux-signed-image-*.postinst 			\
 		debian/linux-signed-image-*.postrm
 
-pre-binary: download-signed
-	./download-signed "linux-image-$(src_abi)-$(flavour_first)" \
-		"$(src_version)" "$(src_package)"
-	for flavour in $(flavours); do					\
-		sbattach --detach vmlinuz-$(src_abi)-$$flavour.efi.signature \
-			vmlinuz-$(src_abi)-$$flavour.efi.signed;	\
-	done
-
-PHONY: pre-clean pre-binary
+PHONY: pre-clean
 
 clean:: pre-clean
-binary:: pre-binary
-binary-arch:: pre-binary
 
 %:
 	dh $@
 
-override_dh_auto_install:
+override_dh_auto_build:
+	./download-signed "linux-image-$(src_abi)-$(flavour_first)"	\
+		"$(src_version)" "$(src_package)"
+	for flavour in $(flavours); do					\
+		sbattach --detach vmlinuz-$(src_abi)-$$flavour.efi.signature \
+			vmlinuz-$(src_abi)-$$flavour.efi.signed;	\
+	done
+
+override_dh_auto_install: vmlinuz-$(src_abi)-$(flavour_first).efi.signature
 	for flavour in $(flavours); do					\
 		echo "vmlinuz-$(src_abi)-$$flavour.efi.signature usr/lib/linux"	\
 			 >"debian/linux-signed-image-$(src_abi)-$$flavour.install"; \
+	done;								\
+	for flavour in $(udeb_flavours); do				\
 		echo "vmlinuz-$(src_abi)-$$flavour.efi.signed boot"	\
 			 >"debian/kernel-signed-image-$(src_abi)-$$flavour-di.install"; \
 	done