diff --git a/make/linux-rpm.mk b/make/linux-rpm.mk
index 83f4fcae..ceb54ddd 100644
--- a/make/linux-rpm.mk
+++ b/make/linux-rpm.mk
@@ -109,7 +109,7 @@ toplevel-makefile: patches.done
 		if ($$0 ~ /EXTRAVERSION *= *-/) {                             \
 			oldextra=$$3;                                         \
 			gsub(/-/,_,oldextra);                                 \
-			printf "EXTRAVERSION = -%s_%s \n", release, oldextra  \
+			printf "EXTRAVERSION = -%s_%s\n", release, oldextra  \
 		} else if ($$0 ~ /EXTRAVERSION *= *$$/) {                     \
 			printf "EXTRAVERSION = -%s\n",release                 \
 		} else {                                                      \
@@ -123,8 +123,13 @@ linux-$(KERNEL_VERSION)/Makefile: toplevel-makefile
 	cp $< $@
 
 unpack.done: $(KERNEL_PKG)
-	rm -rf linux-$(KERNEL_VERSION)-$(KERNEL_RELEASE) 
+	rm -rf linux-$(KERNEL_VERSION)
+ifeq ($(suffix $(KERNEL_PKG)),.gz)
 	tar -xzf $(KERNEL_PKG)
+endif
+ifeq ($(suffix $(KERNEL_PKG)),.bz2)
+	tar -xjf $(KERNEL_PKG)
+endif
 	touch $@
 
 %.lxdone: unpack.done config-$(KERNEL_VERSION) $(LOCAL_PRE_BUILD) linux-$(KERNEL_VERSION)/Makefile
@@ -258,8 +263,9 @@ dist: clean
 	tar -czf kernel.tar.gz `find kernel -type f -maxdepth 1 | grep -ve "setup\|trash\|CVS"`
 	mv ../kernel.tar.gz .
 clean:
+	rm -rf $(TMP_INSTALL)
 	rm -rf install/* reiser.patch *~ *.done *.lxdone *.uldone *.patch *.rpm *.tar.gz *.tar $(SCOPE_DRIVER_BASE)
-	rm -rf linux linux-$(KERNEL_VERSION) $(TMP_INSTALL) CURRENT_*
+	rm -rf linux linux-$(KERNEL_VERSION) CURRENT_*
 	rm -f toplevel-makefile
 
 newrelease: