diff --git a/make/linux-rpm.mk b/make/linux-rpm.mk
index 3df40d63..e94a57c5 100644
--- a/make/linux-rpm.mk
+++ b/make/linux-rpm.mk
@@ -52,11 +52,11 @@ $(KERNEL_PKG):
 	install -m 664 $(notdir $(KERNEL_PKG)) $@
 
 EXTRAVERSION: linux-$(KERNEL_VERSION)/Makefile
-	sed '/^[ 	]*EXTRAVERSION[ 	]*=/ !d; s/^[ 	]*EXTRAVERSION[ 	]*=[ 	]*//; s/[ 	]*$$//' $< >$@
+	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/- *$$//' > $@
+	echo -n $(KERNEL_VERSION)-$(EXTRAVERSION) | sed 's/- *$$//' > $@
 else
 	echo -n $(KERNEL_MAJOR).$(KERNEL_MINOR).$(KERNEL_RELEASE)$(EXTRAVERSION) > $@
 endif
@@ -68,16 +68,12 @@ config-$(KERNEL_VERSION):
 
 toplevel-makefile: unpack.done patches.done
 	awk -F = -v release=$(RPM_RELEASE) '{                                   \
-		if ($$0 ~ /EXTRAVERSION[ 	]*=[ 	]*$$/) {                \
+		if ($$0 ~ /EXTRAVERSION[ 	]*=/) {                         \
 			if (release ~ "^ *$$") {                                \
 				printf "EXTRAVERSION =\n"                       \
 			} else {                                                \
 				printf "EXTRAVERSION = -%s\n",release           \
 			}                                                       \
-		} else if ($$0 ~ /EXTRAVERSION[ 	]*=[ 	]*[^ 	]+/) {  \
-			oldextra=$$2;                                           \
-			gsub(/ */,"",oldextra);                                 \
-			printf "EXTRAVERSION = %s-%s\n", oldextra, release      \
 		} else {                                                        \
 			print $$0                                               \
 		}                                                               \