diff --git a/fcst/Makefile b/fcst/Makefile
index 7c3904470..497291bb2 100644
--- a/fcst/Makefile
+++ b/fcst/Makefile
@@ -55,7 +55,9 @@ ifeq ($(INSTALL_MOD_PATH),)
   export INSTALL_MOD_PATH := $(DESTDIR)
 endif
 
-INSTALL_DIR := $(INSTALL_MOD_PATH)/lib/modules/$(KVER)/extra
+INSTALL_MOD_DIR=extra
+
+INSTALL_DIR := $(INSTALL_MOD_PATH)/lib/modules/$(KVER)/$(INSTALL_MOD_DIR)
 
 SCST_DIR := $(shell echo "$$PWD")/../scst/src
 
@@ -67,6 +69,7 @@ install: all
 	KDIR=$(KDIR) ../scripts/sign-modules
 	$(MAKE) -C $(KDIR) M=$(shell pwd)				\
 	  $(shell [ -n "$(PASS_CC_TO_MAKE)" ] && echo CC="$(CC)")	\
+	  INSTALL_MOD_DIR=$(INSTALL_MOD_DIR)				\
 	  $$([ -n "$(DEPMOD)" ] && echo "DEPMOD=$(DEPMOD)")		\
 	  CONFIG_MODULE_SIG_ALL= modules_install
 
diff --git a/iscsi-scst/Makefile b/iscsi-scst/Makefile
index 557088e98..f153e3522 100644
--- a/iscsi-scst/Makefile
+++ b/iscsi-scst/Makefile
@@ -43,7 +43,9 @@ ifeq ($(INSTALL_MOD_PATH),)
   export INSTALL_MOD_PATH := $(DESTDIR)
 endif
 
-INSTALL_DIR := $(INSTALL_MOD_PATH)/lib/modules/$(KVER)/extra
+INSTALL_MOD_DIR=extra
+
+INSTALL_DIR := $(INSTALL_MOD_PATH)/lib/modules/$(KVER)/$(INSTALL_MOD_DIR)
 INFINIBAND_ENABLED = $(shell syms=$$(dirname "$(KDIR)")/modules.symbols; if [ -e "$$syms" ] && grep -wq 'ib_register_client' "$$syms" || grep -q "^CONFIG_INFINIBAND=[my]$$" "$(KDIR)/.config"; then echo true; else echo false; fi)
 
 all: progs mods
@@ -166,6 +168,7 @@ install: all
 	(cd $(KMOD) && KDIR=$(KDIR) ../../scripts/sign-modules)
 	$(MAKE) -C $(KDIR) M=$(KMOD)					\
 	  $(shell [ -n "$(PASS_CC_TO_MAKE)" ] && echo CC="$(CC)")	\
+	  INSTALL_MOD_DIR=$(INSTALL_MOD_DIR)				\
 	  $$([ -n "$(DEPMOD)" ] && echo "DEPMOD=$(DEPMOD)")		\
 	  CONFIG_MODULE_SIG_ALL= modules_install
 	echo "$@:  INFINIBAND_ENABLED = $(INFINIBAND_ENABLED)"
@@ -173,6 +176,7 @@ install: all
 	  (cd $(ISERTMOD) && KDIR=$(KDIR) ../../../scripts/sign-modules);\
 	  $(MAKE) -C $(KDIR) M=$(ISERTMOD)				\
 	    $(shell [ -n "$(PASS_CC_TO_MAKE)" ] && echo CC="$(CC)")	\
+	    INSTALL_MOD_DIR=$(INSTALL_MOD_DIR)				\
 	    $$([ -n "$(DEPMOD)" ] && echo "DEPMOD=$(DEPMOD)")		\
 	    CONFIG_MODULE_SIG_ALL= modules_install;			\
 	fi
diff --git a/qla2x00t-32gbit/Makefile b/qla2x00t-32gbit/Makefile
index cf4cea8cb..48dad4ff1 100644
--- a/qla2x00t-32gbit/Makefile
+++ b/qla2x00t-32gbit/Makefile
@@ -45,7 +45,9 @@ ifeq ($(INSTALL_MOD_PATH),)
   export INSTALL_MOD_PATH := $(DESTDIR)
 endif
 
-INSTALL_DIR := $(INSTALL_MOD_PATH)/lib/modules/$(KVER)/extra
+INSTALL_MOD_DIR=extra
+
+INSTALL_DIR := $(INSTALL_MOD_PATH)/lib/modules/$(KVER)/$(INSTALL_MOD_DIR)
 
 all:
 	$(MAKE) -C $(KDIR) M=$(shell pwd)				\
@@ -56,6 +58,7 @@ install: all
 	KDIR=$(KDIR) ../scripts/sign-modules
 	$(MAKE) -C $(KDIR) M=$(shell pwd)				\
 	  $(shell [ -n "$(PASS_CC_TO_MAKE)" ] && echo CC="$(CC)")	\
+	  INSTALL_MOD_DIR=$(INSTALL_MOD_DIR)				\
 	  $$([ -n "$(DEPMOD)" ] && echo "DEPMOD=$(DEPMOD)")		\
 	  CONFIG_MODULE_SIG_ALL= modules_install
 
diff --git a/qla2x00t-32gbit/qla2x00-target/Makefile b/qla2x00t-32gbit/qla2x00-target/Makefile
index 574527e9a..4de10dc7a 100644
--- a/qla2x00t-32gbit/qla2x00-target/Makefile
+++ b/qla2x00t-32gbit/qla2x00-target/Makefile
@@ -62,7 +62,9 @@ ifndef PREFIX
         PREFIX=/usr/local
 endif
 
-INSTALL_DIR := $(INSTALL_MOD_PATH)/lib/modules/$(KVER)/extra
+INSTALL_MOD_DIR=extra
+
+INSTALL_DIR := $(INSTALL_MOD_PATH)/lib/modules/$(KVER)/$(INSTALL_MOD_DIR)
 
 SCST_DIR := $(shell echo "$$PWD/../../scst/src")
 
@@ -77,6 +79,7 @@ endif
 	KDIR=$(KDIR) ../../scripts/sign-modules
 	$(MAKE) -C $(KDIR) M=$(shell pwd)				\
 	  $(shell [ -n "$(PASS_CC_TO_MAKE)" ] && echo CC="$(CC)")	\
+	  INSTALL_MOD_DIR=$(INSTALL_MOD_DIR)				\
 	  $$([ -n "$(DEPMOD)" ] && echo "DEPMOD=$(DEPMOD)")		\
 	  CONFIG_MODULE_SIG_ALL= modules_install
 
diff --git a/qla2x00t/Makefile b/qla2x00t/Makefile
index 9806a81e5..4bdb5fa1b 100644
--- a/qla2x00t/Makefile
+++ b/qla2x00t/Makefile
@@ -43,7 +43,9 @@ ifeq ($(INSTALL_MOD_PATH),)
   export INSTALL_MOD_PATH := $(DESTDIR)
 endif
 
-INSTALL_DIR := $(INSTALL_MOD_PATH)/lib/modules/$(KVER)/extra
+INSTALL_MOD_DIR=extra
+
+INSTALL_DIR := $(INSTALL_MOD_PATH)/lib/modules/$(KVER)/$(INSTALL_MOD_DIR)
 
 all:
 	$(MAKE) -C $(KDIR) M=$(shell pwd)				\
@@ -54,6 +56,7 @@ install: all
 	KDIR=$(KDIR) ../scripts/sign-modules
 	$(MAKE) -C $(KDIR) M=$(shell pwd) BUILD_INI=m			\
 	  $(shell [ -n "$(PASS_CC_TO_MAKE)" ] && echo CC="$(CC)")	\
+	  INSTALL_MOD_DIR=$(INSTALL_MOD_DIR)				\
 	  $$([ -n "$(DEPMOD)" ] && echo "DEPMOD=$(DEPMOD)")		\
 	  CONFIG_MODULE_SIG_ALL= modules_install
 
diff --git a/qla2x00t/qla2x00-target/Makefile b/qla2x00t/qla2x00-target/Makefile
index 0fe34e109..5fdfcf878 100644
--- a/qla2x00t/qla2x00-target/Makefile
+++ b/qla2x00t/qla2x00-target/Makefile
@@ -61,7 +61,9 @@ ifndef PREFIX
         PREFIX=/usr/local
 endif
 
-INSTALL_DIR := $(INSTALL_MOD_PATH)/lib/modules/$(KVER)/extra
+INSTALL_MOD_DIR=extra
+
+INSTALL_DIR := $(INSTALL_MOD_PATH)/lib/modules/$(KVER)/$(INSTALL_MOD_DIR)
 
 SCST_DIR := $(shell echo "$$PWD/../../scst/src")
 
@@ -76,6 +78,7 @@ endif
 	KDIR=$(KDIR) ../../scripts/sign-modules
 	$(MAKE) -C $(KDIR) M=$(shell pwd)				\
 	  $(shell [ -n "$(PASS_CC_TO_MAKE)" ] && echo CC="$(CC)")	\
+	  INSTALL_MOD_DIR=$(INSTALL_MOD_DIR)				\
 	  $$([ -n "$(DEPMOD)" ] && echo "DEPMOD=$(DEPMOD)")		\
 	  CONFIG_MODULE_SIG_ALL= modules_install
 
diff --git a/scst/src/Makefile b/scst/src/Makefile
index 9975a1f94..a4469bfcb 100644
--- a/scst/src/Makefile
+++ b/scst/src/Makefile
@@ -61,8 +61,13 @@ ifeq ($(SCST_INC_DIR),)
 SCST_INC_DIR := ../include
 endif
 
+INSTALL_MOD_DIR=extra
+
 SCST_INTF_VER_FILE := $(SCST_INC_DIR)/scst_itf_ver.h
 
+INSTALL_DIR := $(INSTALL_MOD_PATH)/lib/modules/$(KVER)/$(INSTALL_MOD_DIR)
+INSTALL_DIR_H := $(DESTDIR)$(PREFIX)/include/scst
+
 $(SCST_INTF_VER_FILE): $(SCST_INC_DIR)/scst.h $(SCST_INC_DIR)/scst_const.h $(SCST_INC_DIR)/scst_user.h
 	echo "/* Autogenerated, don't edit */" >$(SCST_INTF_VER_FILE)
 	echo "" >>$(SCST_INTF_VER_FILE)
@@ -94,11 +99,12 @@ install: all
 	KDIR=$(KDIR) ../../scripts/sign-modules
 	$(MAKE) -C $(KDIR) M=$(SCST_DH_MOD_DIR)				\
 	  $(shell [ -n "$(PASS_CC_TO_MAKE)" ] && echo CC="$(CC)")	\
-	  INSTALL_MOD_DIR=extra/dev_handlers				\
+	  INSTALL_MOD_DIR=$(INSTALL_MOD_DIR)/dev_handlers		\
 	  $$([ -n "$(DEPMOD)" ] && echo "DEPMOD=$(DEPMOD)")		\
 	  CONFIG_MODULE_SIG_ALL= modules_install
 	$(MAKE) -C $(KDIR) M=$(SCST_MOD_DIR)				\
 	  $(shell [ -n "$(PASS_CC_TO_MAKE)" ] && echo CC="$(CC)")	\
+	  INSTALL_MOD_DIR=$(INSTALL_MOD_DIR)				\
 	  $$([ -n "$(DEPMOD)" ] && echo "DEPMOD=$(DEPMOD)")		\
 	  CONFIG_MODULE_SIG_ALL= modules_install
 	install -d $(INSTALL_DIR_H)
@@ -133,9 +139,6 @@ uninstall:
 	-/sbin/depmod -b $(INSTALL_MOD_PATH)/ -a $(KVER)
 	rm -rf $(INSTALL_DIR_H)
 
-INSTALL_DIR := $(INSTALL_MOD_PATH)/lib/modules/$(KVER)/extra
-INSTALL_DIR_H := $(DESTDIR)$(PREFIX)/include/scst
-
 clean:
 	rm -f $(SCST_INTF_VER_FILE)
 	$(MAKE) -C $(KDIR) M=$(SCST_MOD_DIR) $@
diff --git a/scst/src/dev_handlers/Makefile b/scst/src/dev_handlers/Makefile
index 4ecbb5fdc..8d5734d5e 100644
--- a/scst/src/dev_handlers/Makefile
+++ b/scst/src/dev_handlers/Makefile
@@ -48,7 +48,9 @@ ifeq ($(INSTALL_MOD_PATH),)
   export INSTALL_MOD_PATH := $(DESTDIR)
 endif
 
-INSTALL_DIR := $(INSTALL_MOD_PATH)/lib/modules/$(KVER)/extra
+INSTALL_MOD_DIR=extra/dev_handlers
+
+INSTALL_DIR := $(INSTALL_MOD_PATH)/lib/modules/$(KVER)/$(INSTALL_MOD_DIR)
 
 all:
 	$(MAKE) -C $(KDIR) M=$(shell pwd)				\
@@ -63,12 +65,13 @@ install: all
 	KDIR=$(KDIR) ../../../scripts/sign-modules
 	$(MAKE) -C $(KDIR) M=$(shell pwd)				\
 	  $(shell [ -n "$(PASS_CC_TO_MAKE)" ] && echo CC="$(CC)")	\
+	  INSTALL_MOD_DIR=$(INSTALL_MOD_DIR)				\
 	  $$([ -n "$(DEPMOD)" ] && echo "DEPMOD=$(DEPMOD)")		\
 	  CONFIG_MODULE_SIG_ALL= modules_install
 
 uninstall:
-	rm -f $(INSTALL_DIR)/dev_handlers/scst_*.ko
-	-rmdir $(INSTALL_DIR)/dev_handlers 2>/dev/null
+	rm -f $(INSTALL_DIR)/scst_*.ko
+	-rmdir $(INSTALL_DIR) 2>/dev/null
 
 clean:
 	$(MAKE) -C $(KDIR) M=$(shell pwd) $@
diff --git a/scst_local/Makefile b/scst_local/Makefile
index f53473c13..05e2c4c4e 100644
--- a/scst_local/Makefile
+++ b/scst_local/Makefile
@@ -29,7 +29,9 @@ ifeq ($(INSTALL_MOD_PATH),)
   export INSTALL_MOD_PATH := $(DESTDIR)
 endif
 
-INSTALL_DIR := $(INSTALL_MOD_PATH)/lib/modules/$(KVER)/extra
+INSTALL_MOD_DIR=extra
+
+INSTALL_DIR := $(INSTALL_MOD_PATH)/lib/modules/$(KVER)/$(INSTALL_MOD_DIR)
 
 SCST_DIR := $(shell echo "$$PWD")/../scst/src
 
@@ -41,6 +43,7 @@ install: all
 	KDIR=$(KDIR) ../scripts/sign-modules
 	$(MAKE) -C $(KDIR) M=$(shell pwd)				\
 	  $(shell [ -n "$(PASS_CC_TO_MAKE)" ] && echo CC="$(CC)")	\
+	  INSTALL_MOD_DIR=$(INSTALL_MOD_DIR)				\
 	  $$([ -n "$(DEPMOD)" ] && echo "DEPMOD=$(DEPMOD)")		\
 	  CONFIG_MODULE_SIG_ALL= modules_install
 
diff --git a/srpt/Makefile b/srpt/Makefile
index 5f2a97a01..86ba92f53 100644
--- a/srpt/Makefile
+++ b/srpt/Makefile
@@ -31,7 +31,9 @@ ifeq ($(INSTALL_MOD_PATH),)
   export INSTALL_MOD_PATH := $(DESTDIR)
 endif
 
-INSTALL_DIR := $(INSTALL_MOD_PATH)/lib/modules/$(KVER)/extra
+INSTALL_MOD_DIR=extra
+
+INSTALL_DIR := $(INSTALL_MOD_PATH)/lib/modules/$(KVER)/$(INSTALL_MOD_DIR)
 
 SRC_FILES=$(wildcard */*.[ch])
 
@@ -125,6 +127,7 @@ install: all
 	$(MAKE) -C $(KDIR) M=$(shell pwd)/src				\
 	  $(shell [ -n "$(PASS_CC_TO_MAKE)" ] && echo CC="$(CC)")	\
 	  CONFTEST_CFLAGS="$(CONFTEST_CFLAGS)"				\
+	  INSTALL_MOD_DIR=$(INSTALL_MOD_DIR)				\
 	  $$([ -n "$(DEPMOD)" ] && echo "DEPMOD=$(DEPMOD)")		\
 	  CONFIG_MODULE_SIG_ALL= modules_install