diff --git a/Makefile b/Makefile
index 0f8268b27..38fac7c45 100644
--- a/Makefile
+++ b/Makefile
@@ -408,8 +408,9 @@ scst-rpm:
 	cp $${name}-$(VERSION).tar.bz2 $${rpmtopdir}/SOURCES &&		\
 	sed "s/@rpm_version@/$(VERSION)/g"				\
 		<$${name}.spec.in >$${name}.spec;			\
-	MAKE="$(MAKE)"							\
-	rpmbuild --define="%_topdir $${rpmtopdir}" -ba $${name}.spec &&	\
+	MAKE="$(MAKE)" rpmbuild --define="%_topdir $${rpmtopdir}"	\
+	    $(if $(KVER),--define="%kversion $(KVER)")			\
+	    -ba $${name}.spec &&					\
 	rm -f $${name}-$(VERSION).tar.bz2
 
 rpm:
diff --git a/scst.spec.in b/scst.spec.in
index a77e9f02a..986b196ff 100644
--- a/scst.spec.in
+++ b/scst.spec.in
@@ -1,5 +1,5 @@
 %define kmod_name scst
-%define kversion %{expand:%%(echo ${KVER:-$(uname -r)})}
+%{!?kversion:%define kversion %{expand:%%(uname -r)}}
 %define kernel_rpm %{expand:%%(						\
 	  krpm="$(rpm -qf /boot/vmlinuz-%{kversion} 2>/dev/null |		\
 		grep -v 'is not owned by any package' | head -n 1)";	\