Index: 2005-12-16/arch/i386/Makefile
===================================================================
--- 2005-12-16.orig/arch/i386/Makefile	2005-12-20 18:02:08.691365104 +0100
+++ 2005-12-16/arch/i386/Makefile	2005-12-20 18:02:37.725951176 +0100
@@ -116,11 +116,14 @@ boot := arch/i386/boot-xen
 .PHONY: vmlinuz
 all: vmlinuz
 
+# KBUILD_IMAGE specifies the target image being built
+KBUILD_IMAGE := $(boot)/vmlinuz
+
 vmlinuz: vmlinux
-	$(Q)$(MAKE) $(build)=$(boot) $@
+	$(Q)$(MAKE) $(build)=$(boot) $(KBUILD_IMAGE)
 
 install: vmlinux
-	$(Q)$(MAKE) $(build)=$(boot) XENGUEST=$(XENGUEST) $@
+	$(Q)$(MAKE) $(build)=$(boot) BOOTIMAGE=$(KBUILD_IMAGE) XENGUEST=$(XENGUEST) $@
 else
 all: bzImage
 
@@ -149,6 +152,7 @@ endif
 
 archclean:
 	$(Q)$(MAKE) $(clean)=arch/i386/boot
+	$(Q)$(MAKE) $(clean)=arch/i386/boot-xen
 
 define archhelp
   echo  '* bzImage	- Compressed kernel image (arch/$(ARCH)/boot/bzImage)'
Index: 2005-12-16/arch/i386/boot-xen/Makefile
===================================================================
--- 2005-12-16.orig/arch/i386/boot-xen/Makefile	2005-12-20 18:02:08.800348536 +0100
+++ 2005-12-16/arch/i386/boot-xen/Makefile	2005-12-20 18:03:11.057883952 +0100
@@ -1,21 +1,23 @@
-
 OBJCOPYFLAGS := -g --strip-unneeded
 
-vmlinuz: vmlinux-stripped FORCE
+targets      := vmlinuz vmlinux-stripped
+
+$(obj)/vmlinuz: $(obj)/vmlinux-stripped FORCE
 	$(call if_changed,gzip)
+	@echo 'Kernel: $@ is ready (#'$$(<.version)')'
 
-vmlinux-stripped: vmlinux FORCE
+$(obj)/vmlinux-stripped: vmlinux FORCE
 	$(call if_changed,objcopy)
 
 ROOT_PATH := $(patsubst %/boot,%,$(INSTALL_PATH))
 USR_PATH  := $(ROOT_PATH)/usr
 
 XINSTALL_NAME ?= $(KERNELRELEASE)
-install: vmlinuz
+install: $(BOOTIMAGE)
 	mkdir -p $(INSTALL_PATH)
 	ln -f -s vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX) $(INSTALL_PATH)/vmlinuz-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(XENGUEST)$(INSTALL_SUFFIX)
 	rm -f $(INSTALL_PATH)/vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
-	install -m0644 vmlinuz $(INSTALL_PATH)/vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
+	install -m0644 $< $(INSTALL_PATH)/vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
 	install -m0644 vmlinux $(INSTALL_PATH)/vmlinux-syms-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
 	install -m0664 .config $(INSTALL_PATH)/config-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
 	install -m0664 System.map $(INSTALL_PATH)/System.map-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
Index: 2005-12-16/arch/x86_64/Makefile
===================================================================
--- 2005-12-16.orig/arch/x86_64/Makefile	2005-12-20 18:02:08.694364648 +0100
+++ 2005-12-16/arch/x86_64/Makefile	2005-12-20 18:02:37.731950264 +0100
@@ -74,11 +74,14 @@ boot := arch/i386/boot-xen
 #Default target when executing "make"
 all: vmlinuz
 
+# KBUILD_IMAGE specifies the target image being built
+KBUILD_IMAGE := $(boot)/vmlinuz
+
 vmlinuz: vmlinux
-	$(Q)$(MAKE) $(build)=$(boot) $@
+	$(Q)$(MAKE) $(build)=$(boot) $(KBUILD_IMAGE)
 
 install: vmlinux
-	$(Q)$(MAKE) $(build)=$(boot) XENGUEST=$(XENGUEST) $@
+	$(Q)$(MAKE) $(build)=$(boot) BOOTIMAGE=$(KBUILD_IMAGE) XENGUEST=$(XENGUEST) $@
 else
 #Default target when executing "make"
 all: bzImage
@@ -101,6 +104,7 @@ endif
 
 archclean:
 	$(Q)$(MAKE) $(clean)=$(boot)
+	$(Q)$(MAKE) $(clean)=arch/i386/boot-xen
 
 define archhelp
   echo  '* bzImage	- Compressed kernel image (arch/$(ARCH)/boot/bzImage)'