diff --git a/Makefile b/Makefile
index e5092d915..104403592 100644
--- a/Makefile
+++ b/Makefile
@@ -55,9 +55,9 @@ EMULEX_DIR=emulex
 ISCSI_DIR=iscsi-scst
 
 REVISION ?= $(shell if svn info >/dev/null 2>&1;			 \
-		   then svn info | sed -n 's/^Revision:[[:blank:]]*/r/p';\
-		   else echo -n r; git log | grep -c ^commit;		 \
-		   fi)
+		    then svn info | sed -n 's/^Revision:[[:blank:]]*//p';\
+		    else git log | grep -c ^commit;			 \
+		    fi)
 VERSION = $(shell echo -n "$$(sed -n 's/^\#define[[:blank:]]SCST_VERSION_NAME[[:blank:]]*\"\([^-]*\).*\"/\1/p' scst/include/scst_const.h).$(REVISION)")
 
 help:
diff --git a/scst.spec.in b/scst.spec.in
index e7138ceef..5376f17a7 100644
--- a/scst.spec.in
+++ b/scst.spec.in
@@ -140,6 +140,9 @@ for d in qla2x00t_git/qla2x00-target qla2x00t/qla2x00-target; do
 	break
     fi
 done
+# Set the executable bit such that /usr/lib/rpm/find-debuginfo.sh can find the
+# SCST kernel modules.
+find %{buildroot}/lib/modules -name '*.ko' -print0 | xargs -0 chmod u+x
 rm -f %{buildroot}/lib/modules/%{kversion}/[Mm]odule*
 
 %clean
diff --git a/scstadmin/Makefile b/scstadmin/Makefile
index 0cb1cf85c..79bfbf168 100644
--- a/scstadmin/Makefile
+++ b/scstadmin/Makefile
@@ -3,9 +3,9 @@ ifndef PREFIX
 endif
 
 REVISION ?= $(shell if svn info >/dev/null 2>&1;			 \
-		   then svn info | sed -n 's/^Revision:[[:blank:]]*/r/p';\
-		   else echo -n r; git log | grep -c ^commit;		 \
-		   fi)
+		    then svn info | sed -n 's/^Revision:[[:blank:]]*//p';\
+		    else git log | grep -c ^commit;			 \
+		    fi)
 VERSION = $(shell echo -n "$$(sed -n 's/^[[:blank:]]*\$$VERSION[[:blank:]]*=[[:blank:]]*[\"'"'"']\([0-9.]*\)[\"'"'"'];$$/\1/p' scstadmin/scst-*/lib/SCST/SCST.pm).$(REVISION)")
 
 SCSTADMIN_DIR = $(shell if [ ! -h scstadmin ]; then		\