diff --git a/ibmvstgt/Makefile b/ibmvstgt/Makefile
index bcfa95657..cfa1f6015 100644
--- a/ibmvstgt/Makefile
+++ b/ibmvstgt/Makefile
@@ -26,11 +26,7 @@ all: src/$(MODULE_SYMVERS)
 	$(MAKE) -C $(KDIR) SUBDIRS=$(shell pwd)/src modules
 
 install: all src/ibmvstgt.ko
-	@eval `sed -n 's/#define UTS_RELEASE /KERNELRELEASE=/p' $(KDIR)/include/linux/version.h $(KDIR)/include/linux/utsrelease.h 2>/dev/null`; \
-	for m in libsrp.ko ibmvstgt.ko; do \
-	install -vD -m 644 src/$$m \
-	$(DESTDIR)$(INSTALL_MOD_PATH)/lib/modules/$(KVER)/extra/$$m; done
-	-/sbin/depmod -aq $(KVER)
+	$(MAKE) -C $(KDIR) SUBDIRS=$(shell pwd)/src modules_install
 
 src/Module.symvers src/Modules.symvers: $(SCST_DIR)/$(MODULE_SYMVERS)
 	cp $< $@;
diff --git a/iscsi-scst/Makefile b/iscsi-scst/Makefile
index 5f0a711b6..6815d81ed 100644
--- a/iscsi-scst/Makefile
+++ b/iscsi-scst/Makefile
@@ -57,10 +57,8 @@ install: all
 	@install -vD -m 644 doc/manpages/iscsi-scstd.8 $(DESTDIR)$(MANDIR)/man8/iscsi-scstd.8
 	@install -vD -m 755 usr/iscsi-scst-adm $(DESTDIR)$(SBINDIR)/iscsi-scst-adm
 	@install -vD -m 644 doc/manpages/iscsi-scst-adm.8 $(DESTDIR)$(MANDIR)/man8/iscsi-scst-adm.8
-	@eval `sed -n 's/#define UTS_RELEASE /KERNELRELEASE=/p' $(KDIR)/include/linux/version.h $(KDIR)/include/linux/utsrelease.h 2>/dev/null`; \
-	install -vD -m 644 kernel/iscsi-scst.ko \
-	$(DESTDIR)$(INSTALL_MOD_PATH)/lib/modules/$(KVER)/extra/iscsi-scst.ko
-	-/sbin/depmod -aq $(KVER)
+	$(MAKE) -C $(KDIR) SCST_INC_DIR=$(SCST_INC_DIR) SUBDIRS=$(KMOD) \
+	  modules_install
 
 SCST_MOD_VERS := $(shell ls $(SCST_DIR)/Modules.symvers 2>/dev/null)
 ifneq ($(SCST_MOD_VERS),)
diff --git a/scst.spec.in b/scst.spec.in
index 8c73adac1..7271c67f4 100644
--- a/scst.spec.in
+++ b/scst.spec.in
@@ -71,11 +71,11 @@ done
 %install
 export KVER=%{kver} PREFIX=%{_prefix} MANDIR=%{_mandir}
 export BUILD_2X_MODULE=y CONFIG_SCSI_QLA_FC=y CONFIG_SCSI_QLA2XXX_TARGET=y
-for d in scst iscsi-scst srpt; do
+for d in scst; do
     DESTDIR=%{buildroot} %{make} -C $d install
 done
-for d in fcst qla2x00t/qla2x00-target scst_local; do
-    INSTALL_MOD_PATH=%{buildroot} %{make} -C $d install
+for d in fcst iscsi-scst qla2x00t/qla2x00-target scst_local srpt; do
+    DESTDIR=%{buildroot} INSTALL_MOD_PATH=%{buildroot} %{make} -C $d install
 done
 rm -f %{buildroot}/lib/modules/%{kver}/[Mm]odule*
 
diff --git a/srpt/Makefile b/srpt/Makefile
index 0040cf57f..9172ed0da 100644
--- a/srpt/Makefile
+++ b/srpt/Makefile
@@ -56,10 +56,9 @@ all: src/$(MODULE_SYMVERS)
 	  PRE_CFLAGS="$(OFED_CFLAGS)" SCST_INC_DIR=$(SCST_INC_DIR) modules
 
 install: all src/ib_srpt.ko
-	@eval `sed -n 's/#define UTS_RELEASE /KERNELRELEASE=/p' $(KDIR)/include/linux/version.h $(KDIR)/include/linux/utsrelease.h 2>/dev/null`; \
-	install -vD -m 644 src/ib_srpt.ko \
-	$(DESTDIR)$(INSTALL_MOD_PATH)/lib/modules/$(KVER)/extra/ib_srpt.ko
-	-/sbin/depmod -aq $(KVER)
+	$(MAKE) -C $(KDIR) SUBDIRS=$(shell pwd)/src		   \
+	  PRE_CFLAGS="$(OFED_CFLAGS)" SCST_INC_DIR=$(SCST_INC_DIR) \
+	  modules_install
 
 src/Module.symvers src/Modules.symvers: $(SCST_SYMVERS_DIR)/$(MODULE_SYMVERS)
 	@if $(OFED_KERNEL_IB_RPM_INSTALLED); then                           \