diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py
index 62877b4ab..83cea11ef 100755
--- a/debian/bin/gencontrol.py
+++ b/debian/bin/gencontrol.py
@@ -118,11 +118,6 @@ class Gencontrol(Base):
     def do_arch_setup(self, vars, makeflags, arch, extra):
         config_base = self.config.merge('base', arch)
 
-        if config_base['kernel-arch'] in ['mips', 'parisc', 'powerpc']:
-            vars['image-stem'] = 'vmlinux'
-        else:
-            vars['image-stem'] = 'vmlinuz'
-
         self._setup_makeflags(self.arch_makeflags, makeflags, config_base)
 
     def do_arch_packages(self, packages, makefile, arch, vars, makeflags, extra):
@@ -223,8 +218,13 @@ class Gencontrol(Base):
         ('override-host-type', 'OVERRIDE_HOST_TYPE', True),
     )
 
+    flavour_makeflags_build = (
+        ('image-file', 'IMAGE_FILE', True),
+    )
+
     flavour_makeflags_image = (
         ('type', 'TYPE', False),
+        ('install-stem', 'IMAGE_INSTALL_STEM', True),
     )
 
     flavour_makeflags_other = (
@@ -234,6 +234,7 @@ class Gencontrol(Base):
 
     def do_flavour_setup(self, vars, makeflags, arch, featureset, flavour, extra):
         config_base = self.config.merge('base', arch, featureset, flavour)
+        config_build = self.config.merge('build', arch, featureset, flavour)
         config_description = self.config.merge('description', arch, featureset, flavour)
         config_image = self.config.merge('image', arch, featureset, flavour)
 
@@ -245,8 +246,10 @@ class Gencontrol(Base):
         if override_localversion is not None:
             vars['localversion-image'] = vars['localversion_headers'] + '-' + override_localversion
         vars['initramfs'] = 'YES' if config_image.get('initramfs', True) else ''
+        vars['image-stem'] = config_image.get('install-stem')
 
         self._setup_makeflags(self.flavour_makeflags_base, makeflags, config_base)
+        self._setup_makeflags(self.flavour_makeflags_build, makeflags, config_build)
         self._setup_makeflags(self.flavour_makeflags_image, makeflags, config_image)
         self._setup_makeflags(self.flavour_makeflags_other, makeflags, vars)
 
diff --git a/debian/config/alpha/defines b/debian/config/alpha/defines
index 1e7a5cb76..f9b61ffa0 100644
--- a/debian/config/alpha/defines
+++ b/debian/config/alpha/defines
@@ -2,8 +2,12 @@
 flavours: alpha-generic alpha-smp alpha-legacy
 kernel-arch: alpha
 
+[build]
+image-file: arch/alpha/boot/vmlinux.gz
+
 [image]
 suggests: aboot, fdutils
+install-stem: vmlinuz
 
 [alpha-generic_description]
 hardware: Alpha
diff --git a/debian/config/amd64/defines b/debian/config/amd64/defines
index 51cc7422c..01c752096 100644
--- a/debian/config/amd64/defines
+++ b/debian/config/amd64/defines
@@ -6,10 +6,12 @@ kernel-arch: x86
 
 [build]
 debug-info: true
+image-file: arch/x86/boot/bzImage
 
 [image]
 bootloaders: grub-pc extlinux lilo
 configs:
+install-stem: vmlinuz
 
 [relations]
 headers%gcc-4.8: linux-compiler-gcc-4.8-x86
diff --git a/debian/config/armel/defines b/debian/config/armel/defines
index ed74d6b3b..6e8e9094a 100644
--- a/debian/config/armel/defines
+++ b/debian/config/armel/defines
@@ -15,6 +15,7 @@ suggests: fdutils
 configs:
  kernelarch-arm/config
  armel/config
+install-stem: vmlinuz
 
 [relations]
 headers%gcc-4.8: linux-compiler-gcc-4.8-arm
diff --git a/debian/config/armhf/defines b/debian/config/armhf/defines
index 0083168fa..cc9132227 100644
--- a/debian/config/armhf/defines
+++ b/debian/config/armhf/defines
@@ -12,6 +12,7 @@ suggests: fdutils
 configs:
  kernelarch-arm/config
  armhf/config
+install-stem: vmlinuz
 
 [relations]
 headers%gcc-4.8: linux-compiler-gcc-4.8-arm
diff --git a/debian/config/hppa/defines b/debian/config/hppa/defines
index 1fe6be855..d2f65b383 100644
--- a/debian/config/hppa/defines
+++ b/debian/config/hppa/defines
@@ -2,8 +2,12 @@
 flavours: parisc parisc64-smp
 kernel-arch: parisc
 
+[build]
+image-file: vmlinux
+
 [image]
 suggests: palo
+install-stem: vmlinux
 
 [parisc_description]
 hardware: 32-bit PA-RISC
diff --git a/debian/config/i386/defines b/debian/config/i386/defines
index 72e1b3d7f..1c14fd869 100644
--- a/debian/config/i386/defines
+++ b/debian/config/i386/defines
@@ -4,6 +4,9 @@ featuresets:
  rt
 kernel-arch: x86
 
+[build]
+image-file: arch/x86/boot/bzImage
+
 [description]
 part-long-pae: This kernel requires PAE (Physical Address Extension).
  This feature is supported by the Intel Pentium Pro/II/III/4/4M/D, Xeon,
@@ -13,6 +16,7 @@ part-long-pae: This kernel requires PAE (Physical Address Extension).
 [image]
 bootloaders: grub-pc extlinux lilo
 configs:
+install-stem: vmlinuz
 
 [relations]
 headers%gcc-4.8: linux-compiler-gcc-4.8-x86
diff --git a/debian/config/ia64/defines b/debian/config/ia64/defines
index 34b4ae73f..2776b2680 100644
--- a/debian/config/ia64/defines
+++ b/debian/config/ia64/defines
@@ -5,9 +5,13 @@ flavours:
 kernel-arch: ia64
 compiler: gcc-4.6
 
+[build]
+image-file: vmlinux.gz
+
 [image]
 bootloaders: elilo
 suggests: fdutils
+install-stem: vmlinuz
 
 [itanium_description]
 hardware: Itanium
diff --git a/debian/config/m68k/defines b/debian/config/m68k/defines
index 2cd4c614d..28a85e012 100644
--- a/debian/config/m68k/defines
+++ b/debian/config/m68k/defines
@@ -5,8 +5,12 @@ flavours:
  m68k
 kernel-arch: m68k
 
+[build]
+image-file: vmlinux.gz
+
 [image]
 suggests: vmelilo, fdutils
+install-stem: vmlinuz
 
 [m68k_description]
 hardware: Motorola MC68020+ family
diff --git a/debian/config/mips/defines b/debian/config/mips/defines
index 5d62cef5c..3c41e3027 100644
--- a/debian/config/mips/defines
+++ b/debian/config/mips/defines
@@ -9,8 +9,12 @@ flavours:
  octeon
 kernel-arch: mips
 
+[build]
+image-file: vmlinux
+
 [image]
 initramfs: false
+install-stem: vmlinux
 
 [r4k-ip22_description]
 hardware: SGI IP22
diff --git a/debian/config/mipsel/defines b/debian/config/mipsel/defines
index 440d7cff1..d3123dbac 100644
--- a/debian/config/mipsel/defines
+++ b/debian/config/mipsel/defines
@@ -8,8 +8,12 @@ flavours:
  loongson-2f
 kernel-arch: mips
 
+[build]
+image-file: vmlinux
+
 [image]
 initramfs: false
+install-stem: vmlinux
 
 [sb1-bcm91250a_description]
 hardware: BCM91250A
diff --git a/debian/config/powerpc/defines b/debian/config/powerpc/defines
index 2acb807ad..082eeff25 100644
--- a/debian/config/powerpc/defines
+++ b/debian/config/powerpc/defines
@@ -5,8 +5,12 @@ flavours:
  powerpc64
 kernel-arch: powerpc
 
+[build]
+image-file: vmlinux
+
 [image]
 suggests: mkvmlinuz
+install-stem: vmlinux
 
 [powerpc_description]
 hardware: uniprocessor 32-bit PowerPC
diff --git a/debian/config/powerpcspe/defines b/debian/config/powerpcspe/defines
index 14b80b72b..cf5a09338 100644
--- a/debian/config/powerpcspe/defines
+++ b/debian/config/powerpcspe/defines
@@ -3,9 +3,13 @@ flavours:
  powerpcspe
 kernel-arch: powerpc
 
+[build]
+image-file: vmlinux
+
 [image]
 suggests: mkvmlinuz
 configs: powerpc/config powerpcspe/config.powerpcspe
+install-stem: vmlinux
 
 [description]
 hardware: 32-bit PowerPC with SPE (instead of AltiVec) with SMP support
diff --git a/debian/config/ppc64/defines b/debian/config/ppc64/defines
index db1957ae5..0f729d890 100644
--- a/debian/config/ppc64/defines
+++ b/debian/config/ppc64/defines
@@ -3,9 +3,13 @@ flavours:
  powerpc64
 kernel-arch: powerpc
 
+[build]
+image-file: vmlinux
+
 [image]
 configs: powerpc/config
 suggests: mkvmlinuz
+install-stem: vmlinux
 
 [powerpc64_description]
 hardware: 64-bit PowerPC
diff --git a/debian/config/s390/defines b/debian/config/s390/defines
index f0d7147d7..2b3e7f4c6 100644
--- a/debian/config/s390/defines
+++ b/debian/config/s390/defines
@@ -3,9 +3,13 @@ flavours:
  s390x
 kernel-arch: s390
 
+[build]
+image-file: arch/s390/boot/image
+
 [image]
 bootloaders: s390-tools
 configs: s390x/config
+install-stem: vmlinuz
 
 [relations]
 headers%gcc-4.8: linux-compiler-gcc-4.8-s390
diff --git a/debian/config/s390x/defines b/debian/config/s390x/defines
index 502ba8247..558a03b86 100644
--- a/debian/config/s390x/defines
+++ b/debian/config/s390x/defines
@@ -3,8 +3,12 @@ flavours:
  s390x
 kernel-arch: s390
 
+[build]
+image-file: arch/s390/boot/image
+
 [image]
 bootloaders: s390-tools
+install-stem: vmlinuz
 
 [relations]
 headers%gcc-4.8: linux-compiler-gcc-4.8-s390
diff --git a/debian/config/sh4/defines b/debian/config/sh4/defines
index 22a935314..bc9ba7b5c 100644
--- a/debian/config/sh4/defines
+++ b/debian/config/sh4/defines
@@ -10,6 +10,7 @@ image-file: arch/sh/boot/zImage
 
 [image]
 suggests: fdutils
+install-stem: vmlinuz
 
 [sh7751r_description]
 hardware: sh7751r
diff --git a/debian/config/sparc/defines b/debian/config/sparc/defines
index 9cc38b979..117a45e56 100644
--- a/debian/config/sparc/defines
+++ b/debian/config/sparc/defines
@@ -4,8 +4,12 @@ flavours:
  sparc64-smp
 kernel-arch: sparc
 
+[build]
+image-file: arch/sparc/boot/zImage
+
 [image]
 suggests: silo, fdutils
+install-stem: vmlinuz
 
 [sparc32_description]
 hardware: uniprocessor sparc32 (sun4m)
diff --git a/debian/config/sparc64/defines b/debian/config/sparc64/defines
index 0e117b473..d6ea29521 100644
--- a/debian/config/sparc64/defines
+++ b/debian/config/sparc64/defines
@@ -4,9 +4,13 @@ flavours:
  sparc64-smp
 kernel-arch: sparc
 
+[build]
+image-file: arch/sparc/boot/zImage
+
 [image]
 configs: sparc/config
 suggests: silo, fdutils
+install-stem: vmlinuz
 
 [sparc64_description]
 hardware: uniprocessor 64-bit UltraSPARC
diff --git a/debian/rules.real b/debian/rules.real
index bb819e302..78b7afce4 100644
--- a/debian/rules.real
+++ b/debian/rules.real
@@ -370,52 +370,21 @@ endif
 	  PACKAGE_DIR='$(PACKAGE_DIR)' PACKAGE_NAME='$(PACKAGE_NAME)' REAL_VERSION='$(REAL_VERSION)'
 	+$(MAKE_SELF) install-base
 
-install-image_sparc_$(FEATURESET)_$(FLAVOUR)_plain_image \
-install-image_sparc64_$(FEATURESET)_$(FLAVOUR)_plain_image \
-install-image_sh4_$(FEATURESET)_$(FLAVOUR)_plain_image:
-	install -m644 '$(DIR)/arch/$(KERNEL_ARCH)/boot/zImage' $(INSTALL_DIR)/vmlinuz-$(REAL_VERSION)
-
-ifneq ($(filter armel armhf,$(ARCH)),)
-install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain_image: DTB_INSTALL_DIR = /usr/lib/linux-image-$(REAL_VERSION)
+install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain_image: DT_INSTALL_DIR = $(PACKAGE_DIR)/usr/lib/linux-image-$(REAL_VERSION)
 install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain_image:
-	install -m644 '$(DIR)/arch/$(KERNEL_ARCH)/boot/zImage' $(INSTALL_DIR)/vmlinuz-$(REAL_VERSION)
+	install -m644 '$(DIR)/$(IMAGE_FILE)' $(INSTALL_DIR)/$(IMAGE_INSTALL_STEM)-$(REAL_VERSION)
+ifneq ($(filter armel armhf,$(ARCH)),)
 	+$(MAKE_CLEAN) -C $(DIR) dtbs
 	shopt -s nullglob ; for i in $(DIR)/arch/arm/boot/dts/*.dtb ; do \
-		install -D -m644 $$i '$(PACKAGE_DIR)'/'$(DTB_INSTALL_DIR)'/$$(basename $$i) ; \
+		install -D -m644 $$i '$(DT_INSTALL_DIR)'/$$(basename $$i) ; \
 	done
 endif
-
-install-image_amd64_$(FEATURESET)_$(FLAVOUR)_plain_image \
-install-image_i386_$(FEATURESET)_$(FLAVOUR)_plain_image:
-	install -m644 '$(DIR)/arch/$(KERNEL_ARCH)/boot/bzImage' $(INSTALL_DIR)/vmlinuz-$(REAL_VERSION)
-
-install-image_alpha_$(FEATURESET)_$(FLAVOUR)_plain_image:
-	install -m644 '$(DIR)/arch/$(KERNEL_ARCH)/boot/vmlinux.gz' $(INSTALL_DIR)/vmlinuz-$(REAL_VERSION)
-
-install-image_ia64_$(FEATURESET)_$(FLAVOUR)_plain_image \
-install-image_m68k_$(FEATURESET)_$(FLAVOUR)_plain_image:
-	install -m644 '$(DIR)/vmlinux.gz' $(INSTALL_DIR)/vmlinuz-$(REAL_VERSION)
-
-install-image_hppa_$(FEATURESET)_$(FLAVOUR)_plain_image \
-install-image_mips_$(FEATURESET)_$(FLAVOUR)_plain_image \
-install-image_mipsel_$(FEATURESET)_$(FLAVOUR)_plain_image:
-	install -m644 '$(DIR)/vmlinux' $(INSTALL_DIR)/vmlinux-$(REAL_VERSION)
-
-install-image_powerpc_$(FEATURESET)_$(FLAVOUR)_plain_image: WRAPPER_INSTALL_DIR = '$(CURDIR)'/$(PACKAGE_DIR)/usr/lib/linux-image-$(REAL_VERSION)
-install-image_powerpcspe_$(FEATURESET)_$(FLAVOUR)_plain_image: WRAPPER_INSTALL_DIR = '$(CURDIR)'/$(PACKAGE_DIR)/usr/lib/linux-image-$(REAL_VERSION)
-install-image_ppc64_$(FEATURESET)_$(FLAVOUR)_plain_image: WRAPPER_INSTALL_DIR = '$(CURDIR)'/$(PACKAGE_DIR)/usr/lib/linux-image-$(REAL_VERSION)
-install-image_powerpc_$(FEATURESET)_$(FLAVOUR)_plain_image \
-install-image_powerpcspe_$(FEATURESET)_$(FLAVOUR)_plain_image \
-install-image_ppc64_$(FEATURESET)_$(FLAVOUR)_plain_image:
-	install -m644 '$(DIR)/vmlinux' $(INSTALL_DIR)/vmlinux-$(REAL_VERSION)
+ifneq ($(filter powerpc powerpcspe ppc64,$(ARCH)),)
 	+$(MAKE_CLEAN) -C '$(DIR)' bootwrapper_install \
-	  WRAPPER_OBJDIR='$(WRAPPER_INSTALL_DIR)' \
-	  WRAPPER_DTSDIR='$(WRAPPER_INSTALL_DIR)'/dts \
-	  WRAPPER_BINDIR='$(WRAPPER_INSTALL_DIR)'
-
-install-image_s390_$(FEATURESET)_$(FLAVOUR)_plain_image \
-install-image_s390x_$(FEATURESET)_$(FLAVOUR)_plain_image:
-	install -m644 '$(DIR)/arch/s390/boot/image' $(INSTALL_DIR)/vmlinuz-$(REAL_VERSION)
+	  WRAPPER_OBJDIR='$(CURDIR)/$(DT_INSTALL_DIR)' \
+	  WRAPPER_DTSDIR='$(CURDIR)/$(DT_INSTALL_DIR)'/dts \
+	  WRAPPER_BINDIR='$(CURDIR)/$(DT_INSTALL_DIR)'
+endif
 
 install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain_bug:
 	dh_installdirs usr/share/bug/$(PACKAGE_NAME)