diff --git a/arch/sparc/Makefile b/arch/sparc/Makefile
index 43db7e1d53354119f6b8313108c1b90ab6aa82a3..9c4c8b8b451d050a0c2b9f7496ba2af98611052d 100644
--- a/arch/sparc/Makefile
+++ b/arch/sparc/Makefile
@@ -58,8 +58,6 @@ archclean:
 # This is the image used for packaging
 KBUILD_IMAGE := $(boot)/zImage
 
-CLEAN_FILES += arch/$(ARCH)/boot/System.map
-
 # Don't use tabs in echo arguments.
 define archhelp
   echo  '* image        - kernel image ($(boot)/image)'
diff --git a/arch/sparc/boot/Makefile b/arch/sparc/boot/Makefile
index 4fd562034a746e0b133b6bce867d4820712fc211..06b653df820da7066d28c5ab1f216e22aaf62ba6 100644
--- a/arch/sparc/boot/Makefile
+++ b/arch/sparc/boot/Makefile
@@ -7,7 +7,8 @@ ROOT_IMG	:= /usr/src/root.img
 ELFTOAOUT	:= elftoaout
 
 hostprogs-y	:= piggyback btfixupprep
-targets		:= tftpboot.img btfix.o btfix.S image
+targets		:= tftpboot.img btfix.o btfix.S image zImage
+clean-files	:= System.map
 
 quiet_cmd_elftoaout	= ELFTOAOUT $@
       cmd_elftoaout	= $(ELFTOAOUT) $(obj)/image -o $@