diff --git a/make/linux-rpm.mk b/make/linux-rpm.mk
index dffaa55e..b8dc66e4 100644
--- a/make/linux-rpm.mk
+++ b/make/linux-rpm.mk
@@ -58,11 +58,11 @@ EXTRAVERSION: linux-$(KERNEL_VERSION)/Makefile
 	sed '/^ *EXTRAVERSION *=/ !d; s/^ *EXTRAVERSION *= *-*//; s/ *$$//' $< >$@
 
 COMPLETE_VERSION: EXTRAVERSION
-ifeq ($(shell echo $(KERNEL_VERSION) | sed '/[0-9]*\.[0-9]*\.[0-9]*\.[0-9]*/ !d'),)
-	echo -n $(KERNEL_VERSION)-$(EXTRAVERSION) | sed 's/- *$$//' > $@
-else
+#ifeq ($(shell echo $(KERNEL_VERSION) | sed '/[0-9]*\.[0-9]*\.[0-9]*\.[0-9]*/ !d'),)
+#	echo -n $(KERNEL_VERSION)-$(EXTRAVERSION) | sed 's/- *$$//' > $@
+#else
 	echo -n $(KERNEL_MAJOR).$(KERNEL_MINOR).$(KERNEL_RELEASE)$(EXTRAVERSION) > $@
-endif
+#endif
 
 config-$(KERNEL_VERSION):
 	cp $(shell ls config-$(KERNEL_MAJOR).$(KERNEL_MINOR).* | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]\)[.$$]./\1.\2.0\3/; s/\.\([0-9]\)$$/.0\1/' | sort -g | sed 's/\.0/./g; $$ !d') $@
@@ -74,7 +74,7 @@ toplevel-makefile: unpack.done patches.done
 		if ($$0 ~ /EXTRAVERSION *= *-/) {                             \
 			oldextra=$$3;                                         \
 			gsub(/-/,_,oldextra);                                 \
-			printf "EXTRAVERSION = -%s_%s\n", release, oldextra   \
+			printf "EXTRAVERSION = _%s-%s\n", oldextra, release   \
 		} else if ($$0 ~ /EXTRAVERSION *= *\./) {                     \
 			oldextra=$$3;                                         \
 			gsub(/-/,_,oldextra);                                 \
@@ -122,7 +122,8 @@ clean-patch-%:
 	rm -f patches/$*-$(KERNEL_VERSION).patch
 	make patches/$*-$(KERNEL_VERSION).patch
 
-patches/%-$(KERNEL_VERSION).patch: unpack.done
+patches/%-$(KERNEL_VERSION).patch:
+	make unpack.done
 	export LANG=en_US ;\
 		diff --exclude=CVS --unidirectional-new-file -aur \
 			linux-$(KERNEL_VERSION) linux-$(KERNEL_VERSION)-$* | \