diff --git a/scst.spec.in b/scst.spec.in
index b6b528f7b..af674bf2d 100644
--- a/scst.spec.in
+++ b/scst.spec.in
@@ -8,14 +8,16 @@
 #   version number when building on a koji build server.
 # - Otherwise use the version number of the running kernel.
 %{!?kversion:
-    %{?kdir:%define kversion %{expand:%%(make -sC %{kdir} kernelversion)}}
+    %{?kdir:%define kversion %{expand:%%(
+	make -sC "%{kdir}" kernelversion | grep -v ^make)}}
     %{!?kdir:
 	%define kversion %{expand:%%(
 	    if rpm --quiet -q kernel-headers; then
 		rpm -q --qf '%%%%{BUILDTIME} %%%%{version}-%%%%{release}.%%%%{arch}\\n' \\
 		    kernel-headers | sort | tail -n1 | { read a b; echo $b; };
 	    else
-		uname -r;
+		make -sC "/lib/modules/$(uname -r)/build/" kernelversion |
+		grep -v ^make;
 	    fi
 	)}}}
 %{echo:kversion=%{kversion}