diff --git a/fcst/Makefile b/fcst/Makefile
index 354ab7551..ae40f0b92 100644
--- a/fcst/Makefile
+++ b/fcst/Makefile
@@ -33,7 +33,7 @@ export CONFIG_FCST   := m
 MODULE_NAME = fcst
 
 ifneq ($(KERNELRELEASE),)
-include $(KBUILD_EXTMOD)/Makefile_in-tree
+include $(src)/Makefile_in-tree
 else
 ######### BEGIN OUT-OF-TREE RULES #########
 
@@ -62,14 +62,8 @@ INSTALL_DIR := $(INSTALL_MOD_PATH)/lib/modules/$(KVER)/extra
 
 SCST_DIR := $(shell echo "$$PWD")/../scst/src
 
-# The file Modules.symvers has been renamed in the 2.6.18 kernel to
-# Module.symvers. Find out which name to use by looking in $(KDIR).
-MODULE_SYMVERS:=$(shell if [ -e "$(KDIR)/Modules.symvers" ]; then \
-		       echo Modules.symvers; else echo Module.symvers; fi)
-
 all:
-	$(MAKE) -C $(KDIR) M=$(shell pwd)			\
-		KBUILD_EXTRA_SYMBOLS=$(SCST_DIR)/$(MODULE_SYMVERS)
+	$(MAKE) -C $(KDIR) M=$(shell pwd)
 
 install: all
 	KDIR=$(KDIR) ../scripts/sign-modules
@@ -90,7 +84,7 @@ endif
 
 clean:
 	rm -f *.o *.ko .*.cmd *.mod.c .*.d .depend *~ \
-		$(MODULE_SYMVERS) Module.markers modules.order
+		Module.symvers Module.markers modules.order
 	rm -rf .tmp_versions
 
 extraclean: clean
diff --git a/fcst/Makefile_in-tree b/fcst/Makefile_in-tree
index a4a24738d..1954f60a5 100644
--- a/fcst/Makefile_in-tree
+++ b/fcst/Makefile_in-tree
@@ -1,6 +1,5 @@
-ifneq ($(and $(KBUILD_EXTMOD),$(if $(findstring $(abspath $(srctree)),$(abspath $(KBUILD_EXTMOD))),,true)),)
-ccflags-y += -I$(KBUILD_EXTMOD)/../scst/include
-endif
+KBUILD_EXTRA_SYMBOLS=$(src)/../scst/src/Module.symvers
+ccflags-y += -I$(src)/../scst/include
 
 obj-$(CONFIG_FCST) += fcst.o
 
diff --git a/iscsi-scst/Makefile b/iscsi-scst/Makefile
index b935c040e..6e992e603 100644
--- a/iscsi-scst/Makefile
+++ b/iscsi-scst/Makefile
@@ -44,14 +44,8 @@ endif
 INSTALL_DIR := $(INSTALL_MOD_PATH)/lib/modules/$(KVER)/extra
 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)
 
-# The file Modules.symvers has been renamed in the 2.6.18 kernel to
-# Module.symvers. Find out which name to use by looking in $(KDIR).
-MODULE_SYMVERS:=$(shell if [ -e "$(KDIR)/Modules.symvers" ]; then \
-		       echo Modules.symvers; else echo Module.symvers; fi)
-
 all: progs mods
 
-ISER_SYMVERS:=$(KMOD)/$(MODULE_SYMVERS)
 OFED_CFLAGS:=
 
 OFED_FLAVOR=$(shell if [ -e /usr/bin/ofed_info ]; then /usr/bin/ofed_info 2>/dev/null | head -n1 | sed -n 's/^\(MLNX_OFED\|OFED-internal\).*/MOFED/p;s/^OFED-.*/OFED/p'; else echo in-tree; fi)
@@ -84,8 +78,7 @@ ifeq ($(OFED_FLAVOR),MOFED)
 			-include $(OFED_DIR)/include/linux/compat-2.6.h \
 			-DMOFED_MAJOR=$(shell echo $(OFED_VERS) | cut -f1 -d.)\
 			-DMOFED_MINOR=$(shell echo $(OFED_VERS) | cut -f2 -d.)
-	OFED_MODULE_SYMVERS:=$(OFED_DIR)/$(MODULE_SYMVERS)
-	ISER_SYMVERS:=$(ISER_SYMVERS) $(OFED_MODULE_SYMVERS)
+	OFED_MODULE_SYMVERS:=$(OFED_DIR)/Module.symvers
 	OFED_CONFIG:= CONFIG_DTRACE=
 else
 	# Whether or not the OFED kernel-ib-devel RPM has been installed.
@@ -99,12 +92,10 @@ else
 	# BACKPORT_INCLUDES.
 	include /usr/src/ofa_kernel/config.mk
 	OFED_CFLAGS:=$(shell echo $(BACKPORT_INCLUDES) -I/usr/src/ofa_kernel/include)
-	ISER_SYMVERS:=$(ISER_SYMVERS) /usr/src/ofa_kernel/$(MODULE_SYMVERS)
 	endif
 
 	ifeq ($(OFED_COMPAT_RDMA_DEVEL_RPM_INSTALLED),true)
 	OFED_CFLAGS:=-I/usr/src/compat-rdma/include -include /usr/src/compat-rdma/include/linux/compat-2.6.h
-	ISER_SYMVERS:=$(ISER_SYMVERS) /usr/src/compat-rdma/$(MODULE_SYMVERS)
 	endif
 endif
 
@@ -126,13 +117,12 @@ PRE_CFLAGS = $(shell					\
 ISER_CFLAGS = $(OFED_CFLAGS) -DOFED_FLAVOR=$(OFED_FLAVOR) $(PRE_CFLAGS)
 
 mods: include/iscsi_scst_itf_ver.h $(CONFTEST_OUTPUTS)
-	$(MAKE) -C $(KDIR) M=$(KMOD) PRE_CFLAGS="$(PRE_CFLAGS)" modules		\
-		KBUILD_EXTRA_SYMBOLS=$(SCST_DIR)/$(MODULE_SYMVERS)
+	$(MAKE) -C $(KDIR) M=$(KMOD) PRE_CFLAGS="$(PRE_CFLAGS)" modules
 	echo "$@:  INFINIBAND_ENABLED = $(INFINIBAND_ENABLED)"
 	if $(INFINIBAND_ENABLED); then					       \
 	  echo "  Building against $(OFED_FLAVOR) InfiniBand kernel headers."; \
 	  $(MAKE) -C $(KDIR) M=$(ISERTMOD) PRE_CFLAGS="$(ISER_CFLAGS)"         \
-	  KBUILD_EXTRA_SYMBOLS="$(ISER_SYMVERS)" $(OFED_CONFIG) modules;	       \
+	  $(OFED_CONFIG) modules;					       \
 	fi
 
 progs: include/iscsi_scst_itf_ver.h
@@ -177,12 +167,12 @@ clean:
 	$(MAKE) -C usr $@
 	$(MAKE) -C $(KDIR) M=$(KMOD) $@
 	$(MAKE) -C $(KDIR) M=$(ISERTMOD) $@
-	rm -f kernel/$(MODULE_SYMVERS) \
+	rm -f kernel/Module.symvers \
 		kernel/Module.markers kernel/modules.order \
-		kernel/isert-scst/$(MODULE_SYMVERS) \
+		kernel/isert-scst/Module.symvers \
 		kernel/isert-scst/Module.markers kernel/isert-scst/modules.order \
 		include/iscsi_scst_itf_ver.h
-	rm -rf conftest/*/*.ko conftest/*/*.mod.c conftest/*/$(MODULE_SYMVERS) conftest/*/*.o \
+	rm -rf conftest/*/*.ko conftest/*/*.mod.c conftest/*/Module.symvers conftest/*/*.o \
 		conftest/*/*.o.cmd conftest/*/*.ko.cmd conftest/*/.*.o.cmd conftest/*/.*.ko.cmd \
 		conftest/*/*.order conftest/*/.*.o.d conftest/*/.tmp_versions/ \
 		conftest/*/result*.txt
diff --git a/iscsi-scst/kernel/Makefile b/iscsi-scst/kernel/Makefile
index bac58cd8b..2a8c90278 100644
--- a/iscsi-scst/kernel/Makefile
+++ b/iscsi-scst/kernel/Makefile
@@ -20,6 +20,8 @@
 #
 #  Note 2! The CFLAGS definitions are now in the main makefile.
 
+KBUILD_EXTRA_SYMBOLS = $(src)/../../scst/src/Module.symvers
+
 ccflags-y += -I$(src)/../include -I$(src)/../../scst/include
 ccflags-y += $(call cc-option,-Wextra) \
 	$(call cc-option,-Wno-old-style-declaration) \
diff --git a/iscsi-scst/kernel/isert-scst/Makefile b/iscsi-scst/kernel/isert-scst/Makefile
index 3808f19d3..d7fb7f081 100644
--- a/iscsi-scst/kernel/isert-scst/Makefile
+++ b/iscsi-scst/kernel/isert-scst/Makefile
@@ -21,7 +21,10 @@
 #  Note 2! The CFLAGS definitions are now in the main makefile.
 
 LINUXINCLUDE := $(PRE_CFLAGS) $(LINUXINCLUDE)
-ccflags-y += -I$(src)/../../include -I$(KBUILD_EXTMOD)/../../../scst/include
+KBUILD_EXTRA_SYMBOLS=$(src)/../../kernel/Module.symvers			       \
+		$(shell for d in /usr/src/ofa_kernel/default/Module.symvers; do\
+			[ -e $$d ] || continue; echo $$d; break; done)
+ccflags-y += -I$(src)/../../include -I$(src)/../../../scst/include
 ccflags-y += $(call cc-option,-Wextra) \
 	$(call cc-option,-Wno-old-style-declaration) \
 	-Wno-unused-parameter -Wno-missing-field-initializers
diff --git a/nightly/conf/nightly.conf b/nightly/conf/nightly.conf
index 2a549eaa6..5ccd9d616 100644
--- a/nightly/conf/nightly.conf
+++ b/nightly/conf/nightly.conf
@@ -3,30 +3,30 @@
 ABT_DETAILS="x86_64"
 ABT_JOBS=5
 ABT_KERNELS="  \
-5.6.14         \
+5.6.15         \
 5.5.19-nc      \
-5.4.42-nc      \
+5.4.43-nc      \
 5.3.18-nc      \
 5.2.21-nc      \
 5.1.21-nc      \
 5.0.21-nc      \
 4.20.17-nc     \
-4.19.124-nc    \
+4.19.125-nc    \
 4.18.20-nc     \
 4.17.19-nc     \
 4.16.18-nc     \
 4.15.18-nc     \
-4.14.181-nc    \
+4.14.182-nc    \
 4.13.16-nc     \
 4.12.14-nc     \
 4.11.12-nc     \
 4.10.17-nc     \
-4.9.224-nc     \
+4.9.225-nc     \
 4.8.17-nc      \
 4.7.10-nc      \
 4.6.7-nc       \
 4.5.7-nc       \
-4.4.224-nc     \
+4.4.225-nc     \
 4.3.6-nc       \
 4.2.8-nc       \
 4.1.52-nc      \
@@ -60,11 +60,12 @@ ABT_KERNELS="  \
 2.6.33.7-nc    \
 2.6.32.27-nc   \
 2.6.31.14-nc   \
-4.18.0-147.5.1.el8_1^CentOS^8.1.1911-nc	\
+4.18.0-193.10.el8^CentOS^8.1.1911-nc	\
 4.18.0-80.11.2.el8_0^CentOS^8.0.1905-nc	\
 3.10.0-1127.el7^CentOS^7.8.2003-nc	\
 3.10.0-1062.18.1.el7^CentOS^7.7.1908-nc	\
 3.10.0-957.27.2.el7^CentOS^7.6.1810-nc	\
 3.10.0-862.14.4.el7^CentOS^7.5.1804-nc	\
-2.6.32-754.29.1.el6^CentOS^6.10-nc	\
+2.6.32-754.29.2.el6^CentOS^6.10-nc	\
+2.6.32-696.30.1.el6^CentOS^6.9-nc	\
 "
diff --git a/qla2x00t-32gbit/Makefile b/qla2x00t-32gbit/Makefile
index 8a6e745a6..3c529c611 100644
--- a/qla2x00t-32gbit/Makefile
+++ b/qla2x00t-32gbit/Makefile
@@ -10,7 +10,7 @@ obj-$(CONFIG_SCSI_QLA_FC) += qla2xxx.o
 
 clean:
 	rm -f *.o *.ko .*.cmd *.mod.c .*.d .depend *~ \
-		$(MODULE_SYMVERS) Module.markers modules.order
+		Module.symvers Module.markers modules.order
 	rm -rf .tmp_versions
 
 extraclean: clean
diff --git a/qla2x00t-32gbit/qla2x00-target/Makefile b/qla2x00t-32gbit/qla2x00-target/Makefile
index cfd3c7dfd..d45cfd5f2 100644
--- a/qla2x00t-32gbit/qla2x00-target/Makefile
+++ b/qla2x00t-32gbit/qla2x00-target/Makefile
@@ -54,13 +54,16 @@ endif
 ifeq ($(BUILD_2X_MODULE),)
 QLA2XXX_INC_DIR := $(KDIR)/drivers/scsi/qla2xxx
 else
-QLA2XXX_INC_DIR := $(KBUILD_EXTMOD)/..
+QLA2XXX_INC_DIR := $(src)/..
 QLA2XXX_DIR := $(shell pwd)/..
 QLA2XXX_SCST := qla2xxx_scst
 endif
 
 ifneq ($(PATCHLEVEL),)
-ccflags-y += -I$(KBUILD_EXTMOD)/../../scst/include
+
+KBUILD_EXTRA_SYMBOLS = $(src)/../../scst/src/Module.symvers \
+			$(src)/../Module.symvers
+ccflags-y += -I$(src)/../../scst/include
 ccflags-y += -W -Wno-unused-parameter -Wno-missing-field-initializers
 #ccflags-y += -DCONFIG_QLA_TGT_DEBUG_WORK_IN_THREAD
 #ccflags-y += -DCONFIG_QLA_TGT_DEBUG_SRR
@@ -84,14 +87,8 @@ INSTALL_DIR := $(INSTALL_MOD_PATH)/lib/modules/$(KVER)/extra
 
 SCST_DIR := $(shell echo "$$PWD/../../scst/src")
 
-# The file Modules.symvers has been renamed in the 2.6.18 kernel to
-# Module.symvers. Find out which name to use by looking in $(KDIR).
-MODULE_SYMVERS:=$(shell if [ -e "$(KDIR)/Modules.symvers" ]; then \
-		       echo Modules.symvers; else echo Module.symvers; fi)
-
 all: $(QLA2XXX_SCST)
-	$(MAKE) -C $(KDIR) M=$(shell pwd)			\
-		KBUILD_EXTRA_SYMBOLS="$(SCST_DIR)/$(MODULE_SYMVERS) $(QLA2XXX_DIR)/$(MODULE_SYMVERS)"
+	$(MAKE) -C $(KDIR) M=$(shell pwd)
 
 install: all
 ifneq ($(BUILD_2X_MODULE),)
@@ -120,7 +117,7 @@ endif
 
 clean:
 	rm -f *.o *.ko .*.cmd *.mod.c .*.d .depend *~ \
-		$(MODULE_SYMVERS) Module.markers modules.order
+		Module.symvers Module.markers modules.order
 	rm -rf .tmp_versions
 
 extraclean: clean
diff --git a/qla2x00t/Makefile b/qla2x00t/Makefile
index 42a958213..e51634e77 100644
--- a/qla2x00t/Makefile
+++ b/qla2x00t/Makefile
@@ -1,5 +1,7 @@
 ifeq ($(BUILD_2X_MODULE),)
 
+KBUILD_EXTRA_SYMBOLS=$(src)/../scst/Module.symvers
+
 qla2xxx-y := qla_os.o qla_init.o qla_mbx.o qla_iocb.o qla_isr.o qla_gs.o \
 		qla_dbg.o qla_sup.o qla_attr.o qla_mid.o qla_dfs.o qla_bsg.o qla_nx.o
 
@@ -7,7 +9,7 @@ obj-$(CONFIG_SCSI_QLA_FC) += qla2xxx.o
 
 clean:
 	rm -f *.o *.ko .*.cmd *.mod.c .*.d .depend *~ \
-		$(MODULE_SYMVERS) Module.markers modules.order
+		Module.symvers Module.markers modules.order
 	rm -rf .tmp_versions
 
 extraclean: clean
diff --git a/qla2x00t/qla2x00-target/Makefile b/qla2x00t/qla2x00-target/Makefile
index f97b1213c..644d89b94 100644
--- a/qla2x00t/qla2x00-target/Makefile
+++ b/qla2x00t/qla2x00-target/Makefile
@@ -53,13 +53,16 @@ endif
 ifeq ($(BUILD_2X_MODULE),)
 QLA2XXX_INC_DIR := $(KDIR)/drivers/scsi/qla2xxx
 else
-QLA2XXX_INC_DIR := $(KBUILD_EXTMOD)/..
+QLA2XXX_INC_DIR := $(src)/..
 QLA2XXX_DIR := $(shell pwd)/..
 QLA2XXX_SCST := qla2xxx_scst
 endif
 
 ifneq ($(PATCHLEVEL),)
-ccflags-y += -I$(KBUILD_EXTMOD)/../../scst/include
+
+KBUILD_EXTRA_SYMBOLS = $(src)/../../scst/src/Module.symvers \
+			$(src)/../Module.symvers
+ccflags-y += -I$(src)/../../scst/include
 ccflags-y += -W -Wno-unused-parameter -Wno-missing-field-initializers
 #ccflags-y += -DCONFIG_QLA_TGT_DEBUG_WORK_IN_THREAD
 #ccflags-y += -DCONFIG_QLA_TGT_DEBUG_SRR
@@ -83,14 +86,8 @@ INSTALL_DIR := $(INSTALL_MOD_PATH)/lib/modules/$(KVER)/extra
 
 SCST_DIR := $(shell echo "$$PWD/../../scst/src")
 
-# The file Modules.symvers has been renamed in the 2.6.18 kernel to
-# Module.symvers. Find out which name to use by looking in $(KDIR).
-MODULE_SYMVERS:=$(shell if [ -e "$(KDIR)/Modules.symvers" ]; then \
-		       echo Modules.symvers; else echo Module.symvers; fi)
-
 all: $(QLA2XXX_SCST)
-	$(MAKE) -C $(KDIR) M=$(shell pwd)			\
-		KBUILD_EXTRA_SYMBOLS="$(SCST_DIR)/$(MODULE_SYMVERS) $(QLA2XXX_DIR)/$(MODULE_SYMVERS)"
+	$(MAKE) -C $(KDIR) M=$(shell pwd)
 
 install: all
 ifneq ($(BUILD_2X_MODULE),)
@@ -111,8 +108,7 @@ endif
 ifneq ($(BUILD_2X_MODULE),)
 qla2xxx_scst:
 	$(MAKE) BUILD_2X_MODULE=$(BUILD_2X_MODULE) CONFIG_SCSI_QLA2XXX_TARGET=y \
-		M=$(QLA2XXX_DIR) -C $(QLA2XXX_DIR) all		\
-		KBUILD_EXTRA_SYMBOLS=$(QLA2XXX_DIR)/$(MODULE_SYMVERS)
+		M=$(QLA2XXX_DIR) -C $(QLA2XXX_DIR) all
 endif
 
 ########## END OUT-OF-TREE RULES ##########
@@ -120,7 +116,7 @@ endif
 
 clean:
 	rm -f *.o *.ko .*.cmd *.mod.c .*.d .depend *~ \
-		$(MODULE_SYMVERS) Module.markers modules.order
+		Module.symvers Module.markers modules.order
 	rm -rf .tmp_versions
 
 extraclean: clean
diff --git a/scst/include/backport.h b/scst/include/backport.h
index 1b730cc41..39a9d03a6 100644
--- a/scst/include/backport.h
+++ b/scst/include/backport.h
@@ -188,7 +188,8 @@ static inline void *bsg_job_sense(struct bsg_job *job)
  * from Thunderbolt to core") # v4.15.
  */
 #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) && \
-	(!defined(RHEL_MAJOR) || RHEL_MAJOR -0 < 7)
+	(!defined(RHEL_MAJOR) || RHEL_MAJOR -0 < 7 ||	\
+	 RHEL_MAJOR -0 == 7 && RHEL_MINOR -0 < 8)
 static inline void cpu_to_be32_array(__be32 *dst, const u32 *src, size_t len)
 {
 	int i;
@@ -1407,8 +1408,7 @@ static inline void sg_unmark_end(struct scatterlist *sg)
  * See also commit 3ee237dddcd8 ("sched/prio: Add 3 macros of MAX_NICE,
  * MIN_NICE and NICE_WIDTH in prio.h") # v3.15.
  */
-#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 15, 0) && \
-	(!defined(RHEL_MAJOR) || RHEL_MAJOR -0 < 7)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 15, 0) && !defined(MIN_NICE)
 #define MIN_NICE -20
 #endif
 
@@ -1750,15 +1750,13 @@ enum {
 #endif
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0) &&	\
-	(!defined(RHEL_MAJOR) || RHEL_MAJOR -0 < 7)
+	!defined(FC_PORTSPEED_64GBIT)
 /*
  * See also commit cc019a5a3b58 ("scsi: scsi_transport_fc: fix typos on 64/128
  * GBit define names") # v4.16.
  */
-#ifndef FC_PORTSPEED_64GBIT
 #define FC_PORTSPEED_64GBIT 0x1000
 #endif
-#endif
 
 #ifndef FC_PORT_ROLE_UNKNOWN
 #define FC_PORT_ROLE_UNKNOWN			0x00
diff --git a/scst/src/Makefile b/scst/src/Makefile
index 6118df09a..dafc5cb3c 100644
--- a/scst/src/Makefile
+++ b/scst/src/Makefile
@@ -38,7 +38,7 @@ DEV_HANDLERS_DIR = dev_handlers
 ifneq ($(PATCHLEVEL),)
 # See also Documentation/core-api/symbol-namespaces.rst for more information
 # about DEFAULT_SYMBOL_NAMESPACE.
-ccflags-y += -I$(KBUILD_EXTMOD)/../include $(call cc-option,-Wextra) \
+ccflags-y += -I$(src)/../include $(call cc-option,-Wextra) \
 	-Wno-unused-parameter -Wno-missing-field-initializers -Wno-sign-compare\
 	-DDEFAULT_SYMBOL_NAMESPACE=SCST\
 	$(shell [ -n "${CONFIG_SCST_NO_DLM}" ] && echo -DCONFIG_SCST_NO_DLM)
@@ -115,17 +115,11 @@ $(SCST_INTF_VER_FILE): $(SCST_INC_DIR)/scst.h $(SCST_INC_DIR)/scst_const.h $(SCS
 
 all: $(SCST_INTF_VER_FILE)
 	$(MAKE) -C certs KDIR=$(KDIR)
-	$(MAKE) -C $(KDIR) M=$(shell pwd) BUILD_DEV=m			\
-		KBUILD_EXTRA_SYMBOLS=$(SCST_DIR)/$(MODULE_SYMVERS)
+	$(MAKE) -C $(KDIR) M=$(shell pwd) BUILD_DEV=m
 
 scst:
 	$(MAKE) -C $(KDIR) M=$(shell pwd) BUILD_DEV=n
 
-# The file Modules.symvers has been renamed in the 2.6.18 kernel to
-# Module.symvers. Find out which name to use by looking in $(KDIR).
-MODULE_SYMVERS:=$(shell if [ -e $(KDIR)/Modules.symvers ]; then \
-		       echo Modules.symvers; else echo Module.symvers; fi)
-
 install: all
 	@if [ -z "$(DESTDIR)" ] && \
         { rpm -q scst || rpm -q scst-devel; } >/dev/null 2>&1; then \
@@ -146,8 +140,8 @@ install: all
 	for h in $${header_files}; do					\
 	    install -m 644 ../include/$$h $(INSTALL_DIR_H);		\
 	done
-	rm -f $(INSTALL_DIR_H)/$(MODULE_SYMVERS)
-	install -m 644 $(MODULE_SYMVERS) $(INSTALL_DIR_H)
+	rm -f $(INSTALL_DIR_H)/Module.symvers
+	install -m 644 Module.symvers $(INSTALL_DIR_H)
 	mkdir -p $(DESTDIR)/var/lib/scst/pr
 	mkdir -p $(DESTDIR)/var/lib/scst/dif_tags
 	mkdir -p $(DESTDIR)/var/lib/scst/vdev_mode_pages
diff --git a/scst/src/dev_handlers/Makefile b/scst/src/dev_handlers/Makefile
index 034a2ccb2..157aaacd2 100644
--- a/scst/src/dev_handlers/Makefile
+++ b/scst/src/dev_handlers/Makefile
@@ -30,7 +30,8 @@
 SHELL=/bin/bash
 
 ifneq ($(PATCHLEVEL),)
-ccflags-y += -I$(KBUILD_EXTMOD)/../include				\
+KBUILD_EXTRA_SYMBOLS=$(src)/../../Module.symvers
+ccflags-y += -I$(src)/../../include					\
 	$(call cc-option,-Wextra)					\
 	-Wno-unused-parameter -Wno-missing-field-initializers -Wno-sign-compare
 #ccflags-y += -DCONFIG_DEBUG_EXT_COPY_REMAP
diff --git a/scst_local/Makefile b/scst_local/Makefile
index bddd76198..32207ac30 100644
--- a/scst_local/Makefile
+++ b/scst_local/Makefile
@@ -7,7 +7,8 @@ SHELL=/bin/bash
 KMOD 		:= $(shell pwd)/kernel
 
 ifneq ($(PATCHLEVEL),)
-ccflags-y	+= -I$(KBUILD_EXTMOD)/../scst/include
+KBUILD_EXTRA_SYMBOLS=$(src)/../scst/src/Module.symvers
+ccflags-y	+= -I$(src)/../scst/include
 ccflags-y	+= $(call cc-option,-Wextra) -Wno-unused-parameter\
 	-Wno-missing-field-initializers
 
@@ -42,14 +43,8 @@ INSTALL_DIR := $(INSTALL_MOD_PATH)/lib/modules/$(KVER)/extra
 
 SCST_DIR := $(shell echo "$$PWD")/../scst/src
 
-# The file Modules.symvers has been renamed in the 2.6.18 kernel to
-# Module.symvers. Find out which name to use by looking in $(KDIR).
-MODULE_SYMVERS:=$(shell if [ -e "$(KDIR)/Modules.symvers" ]; then \
-		       echo Modules.symvers; else echo Module.symvers; fi)
-
 all:
-	$(MAKE) -C $(KDIR) M=$(shell pwd)				\
-		KBUILD_EXTRA_SYMBOLS=$(SCST_DIR)/$(MODULE_SYMVERS)
+	$(MAKE) -C $(KDIR) M=$(shell pwd)
 
 install: all
 	KDIR=$(KDIR) ../scripts/sign-modules
@@ -66,7 +61,7 @@ endif
 
 clean:
 	@$(MAKE) -C $(KDIR) M=$(shell pwd) clean
-	@$(RM) tags $(MODULE_SYMVERS) Module.markers modules.order
+	@$(RM) tags Module.symvers Module.markers modules.order
 
 extraclean: clean
 	rm -f *.orig *.rej
diff --git a/srpt/Makefile b/srpt/Makefile
index 1b4344a2d..67354b571 100644
--- a/srpt/Makefile
+++ b/srpt/Makefile
@@ -33,11 +33,6 @@ INSTALL_DIR := $(INSTALL_MOD_PATH)/lib/modules/$(KVER)/extra
 
 SRC_FILES=$(wildcard */*.[ch])
 
-# The file Modules.symvers has been renamed in the 2.6.18 kernel to
-# Module.symvers. Find out which name to use by looking in $(KDIR).
-MODULE_SYMVERS:=$(shell if [ -e "$(KDIR)/Modules.symvers" ]; then \
-		       echo Modules.symvers; else echo Module.symvers; fi)
-
 # Name of the OFED kernel package.
 OFED_KERNEL_IB_RPM:=$(shell for r in mlnx-ofa_kernel compat-rdma kernel-ib; do rpm -q $$r 2>/dev/null | grep -q "^$$r" && echo "$$r" && break; done)
 OFED_KERNEL_IB_DEB:=$(shell for p in mlnx-ofed-kernel-dkms mlnx-ofed-kernel-modules; do dpkg-query -s "$$p" >/dev/null 2>&1 && echo "$$p" && break; done)
@@ -78,7 +73,7 @@ OFED_CFLAGS:=$(BACKPORT_INCLUDES) -I$(OFED_KERNEL_DIR)/include
 endif
 endif
 # Any OFED version
-OFED_MODULE_SYMVERS:=$(OFED_KERNEL_DIR)/$(MODULE_SYMVERS)
+OFED_MODULE_SYMVERS:=$(OFED_KERNEL_DIR)/Module.symvers
 endif
 
 # Use make instead of $(MAKE) to get rid of command-line option -i
@@ -99,8 +94,7 @@ PRE_CFLAGS = $(OFED_CFLAGS)			\
 
 all: check $(CONFTEST_OUTPUTS)
 	$(MAKE) -C $(KDIR) M=$(shell pwd)/src PRE_CFLAGS="$(PRE_CFLAGS)"\
-		$(OFED_CONFIG) modules\
-		KBUILD_EXTRA_SYMBOLS="$(SCST_DIR)/$(MODULE_SYMVERS) $(OFED_MODULE_SYMVERS)"
+		$(OFED_CONFIG) modules
 
 install: all
 	@[ -z "$(DESTDIR)$(INSTALL_MOD_PATH)" ] && \
@@ -141,7 +135,7 @@ clean:
 	  [ -d "$$d" ] && $(MAKE) -C $(KDIR) M=$(shell pwd)/$$d clean; \
 	  rm -f $$d/result*.txt;					     \
 	done
-	rm -f src/$(MODULE_SYMVERS) src/Module.markers src/modules.order
+	rm -f src/Module.symvers src/Module.markers src/modules.order
 
 extraclean: clean
 	rm -f *.orig *.rej
diff --git a/srpt/src/Makefile b/srpt/src/Makefile
index 519f47cb7..e5415bbbe 100644
--- a/srpt/src/Makefile
+++ b/srpt/src/Makefile
@@ -1,6 +1,9 @@
 LINUXINCLUDE := $(PRE_CFLAGS) $(LINUXINCLUDE)
 CPPFLAGS     := $(PRE_CFLAGS) $(CPPFLAGS)
-ccflags-y    += -I$(KBUILD_EXTMOD)/../../scst/include
+KBUILD_EXTRA_SYMBOLS=$(src)/../../scst/src/Module.symvers \
+		$(shell for d in /usr/src/ofa_kernel/default/Module.symvers; do\
+			[ -e $$d ] || continue; echo $$d; break; done)
+ccflags-y    += -I$(src)/../../scst/include
 
 #ccflags-y += -Wextra -Wno-unused-parameter
 
diff --git a/usr/fileio/fileio.c b/usr/fileio/fileio.c
index 56962bcd1..a6a0f904d 100644
--- a/usr/fileio/fileio.c
+++ b/usr/fileio/fileio.c
@@ -28,6 +28,7 @@
 #include <stdbool.h>
 #include <inttypes.h>
 #include <signal.h>
+#include <unistd.h>
 #include <sys/types.h>
 #include <sys/user.h>
 #include <poll.h>
@@ -199,8 +200,13 @@ out:
 
 static void *align_alloc(size_t size)
 {
+	static uint32_t page_size;
+
+	if (page_size == 0)
+		page_size = sysconf(_SC_PAGESIZE);
+
 	TRACE_MEM("Request to alloc %zdKB", size / 1024);
-	return memalign(PAGE_SIZE, size);
+	return memalign(page_size, size);
 }
 
 static void sigalrm_handler(int signo)