diff --git a/Makefile b/Makefile
index a66096252..6e5b82e83 100755
--- a/Makefile
+++ b/Makefile
@@ -68,8 +68,8 @@ endif
 ifdef build_makeflags
   kpkg_build_cmd := MAKEFLAGS=$(build_makeflags) $(kpkg_build_cmd)
 endif
-kpkg_image_cmd  := $(if $(image_prefix),$(image_prefix))
-kpkg_image_cmd  += $(kpkg_build_cmd) --initrd kernel_image
+kpkg_image_cmd  := $(image_prefix) $(kpkg_build_cmd) --initrd kernel_image
+kpkg_image_cmd  := $(strip $(kpkg_image_cmd))
 kpkg_build_cmd  += build
 kpkg_headers_cmd += kernel-headers
 ifndef headers_dirs
@@ -104,7 +104,7 @@ binary-arch: build headers-stamp $(istamps)
 
 install-stamp-$(subarch)-%: build-$(subarch)-% build-stamp-$(subarch)-%
 	cp -al $< install-$*;
-	cd install-$*; $(kpkg_image_cmd)
+	cd install-$*; $(subst @flavour@,$*,$(kpkg_image_cmd))
 	cat install-$*/debian/files >> debian/files;
 	rm -rf install-$*;
 	touch install-stamp-$(subarch)-$*