diff --git a/scst.spec.in b/scst.spec.in
index 7271c67f4..cbe10fed9 100644
--- a/scst.spec.in
+++ b/scst.spec.in
@@ -90,6 +90,8 @@ rm -f /usr/local/man/man8/iscsi-scstd.8
 rm -f /usr/local/sbin/iscsi-scst-adm
 rm -f /usr/local/sbin/iscsi-scstd
 rm -rf /usr/local/include/scst
+# Remove existing ib_srpt.ko kernel modules
+find /lib/modules/$(uname -r) -name ib_srpt.ko -exec rm {} \;
 
 %post
 /sbin/depmod -a %{kver}
diff --git a/srpt/Makefile b/srpt/Makefile
index 809b17f7c..95bb21216 100644
--- a/srpt/Makefile
+++ b/srpt/Makefile
@@ -75,8 +75,6 @@ endif
 OFED_MODULE_SYMVERS:=$(OFED_KERNEL_DIR)/Module.symvers
 endif
 
-OTHER_SRPT:=$(shell find /lib/modules/$(KVER) -path /lib/modules/$(KVER)/extra -prune -o -name ib_srpt.ko -print)
-
 HAVE_KCFLAGS    = $(shell $(MAKE) -C $(KDIR) SUBDIRS=$(shell pwd)/conftest/kcflags    KCFLAGS=-DKCFLAGS_MACRO=1       >/dev/null 2>&1 && echo true || echo false)
 HAVE_PRE_CFLAGS = $(shell $(MAKE) -C $(KDIR) SUBDIRS=$(shell pwd)/conftest/pre_cflags PRE_CFLAGS=-DPRE_CFLAGS_MACRO=1 >/dev/null 2>&1 && echo true || echo false)
 AUTOCONF_FLAGS  = $(shell $(MAKE) -C $(KDIR) SUBDIRS=$(shell pwd)/conftest/gid_change PRE_CFLAGS="$(OFED_CFLAGS)"     >/dev/null 2>&1 && echo -DHAVE_IB_EVENT_GID_CHANGE)
@@ -88,6 +86,9 @@ all: src/$(MODULE_SYMVERS)
 	  KCFLAGS="$(AUTOCONF_FLAGS)" SCST_INC_DIR=$(SCST_INC_DIR) modules
 
 install: all src/ib_srpt.ko
+	@[ -z "$(DESTDIR)$(INSTALL_MOD_PATH)" ] && \
+	  find /lib/modules/$(KVER) -name ib_srpt.ko -exec rm {} \; ; \
+	  true
 	$(MAKE) -C $(KDIR) SUBDIRS=$(shell pwd)/src		   \
 	  PRE_CFLAGS="$(OFED_CFLAGS)" SCST_INC_DIR=$(SCST_INC_DIR) \
 	  $$([ -n "$(DESTDIR)$(INSTALL_MOD_PATH)" ] && echo DEPMOD=true) \
@@ -103,10 +104,6 @@ src/Module.symvers src/Modules.symvers: $(SCST_SYMVERS_DIR)/$(MODULE_SYMVERS)
 	    echo "Error: the kernel build system has not yet been patched.";\
 	    false;                                                          \
 	fi
-	@if [ -n "$(OTHER_SRPT)" ]; then                                    \
-	    echo "Error: $(OTHER_SRPT) must be removed first";              \
-	    false;                                                          \
-	fi
 	@if [ -n "$(OFED_KERNEL_IB_RPM)" ]; then                            \
 	  if [ -z "$(OFED_KERNEL_IB_DEVEL_RPM)" ]; then                     \
 	    echo "Error: the OFED package $(OFED_KERNEL_IB_RPM)-devel has"  \