diff --git a/fcst/Makefile b/fcst/Makefile
index 354ab7551..03110073e 100644
--- a/fcst/Makefile
+++ b/fcst/Makefile
@@ -62,14 +62,9 @@ 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)
+		KBUILD_EXTRA_SYMBOLS=$(SCST_DIR)/Module.symvers
 
 install: all
 	KDIR=$(KDIR) ../scripts/sign-modules
@@ -90,7 +85,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/iscsi-scst/Makefile b/iscsi-scst/Makefile
index b935c040e..af2ce46d5 100644
--- a/iscsi-scst/Makefile
+++ b/iscsi-scst/Makefile
@@ -44,14 +44,9 @@ 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)
+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,7 +79,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)
+	OFED_MODULE_SYMVERS:=$(OFED_DIR)/Module.symvers
 	ISER_SYMVERS:=$(ISER_SYMVERS) $(OFED_MODULE_SYMVERS)
 	OFED_CONFIG:= CONFIG_DTRACE=
 else
@@ -99,12 +94,12 @@ 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)
+	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)
+	ISER_SYMVERS:=$(ISER_SYMVERS) /usr/src/compat-rdma/Module.symvers
 	endif
 endif
 
@@ -127,7 +122,7 @@ 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)
+		KBUILD_EXTRA_SYMBOLS=$(SCST_DIR)/Module.symvers
 	echo "$@:  INFINIBAND_ENABLED = $(INFINIBAND_ENABLED)"
 	if $(INFINIBAND_ENABLED); then					       \
 	  echo "  Building against $(OFED_FLAVOR) InfiniBand kernel headers."; \
@@ -177,12 +172,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/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..d37f183fe 100644
--- a/qla2x00t-32gbit/qla2x00-target/Makefile
+++ b/qla2x00t-32gbit/qla2x00-target/Makefile
@@ -84,14 +84,9 @@ 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)"
+		KBUILD_EXTRA_SYMBOLS="$(SCST_DIR)/Module.symvers $(QLA2XXX_DIR)/Module.symvers"
 
 install: all
 ifneq ($(BUILD_2X_MODULE),)
@@ -120,7 +115,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..dc4be03c2 100644
--- a/qla2x00t/Makefile
+++ b/qla2x00t/Makefile
@@ -7,7 +7,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..5e66826f5 100644
--- a/qla2x00t/qla2x00-target/Makefile
+++ b/qla2x00t/qla2x00-target/Makefile
@@ -83,14 +83,9 @@ 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)"
+		KBUILD_EXTRA_SYMBOLS="$(SCST_DIR)/Module.symvers $(QLA2XXX_DIR)/Module.symvers"
 
 install: all
 ifneq ($(BUILD_2X_MODULE),)
@@ -112,7 +107,7 @@ 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)
+		KBUILD_EXTRA_SYMBOLS=$(QLA2XXX_DIR)/Module.symvers
 endif
 
 ########## END OUT-OF-TREE RULES ##########
@@ -120,7 +115,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/src/Makefile b/scst/src/Makefile
index 6118df09a..81eda0050 100644
--- a/scst/src/Makefile
+++ b/scst/src/Makefile
@@ -116,16 +116,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)
+		KBUILD_EXTRA_SYMBOLS=$(SCST_DIR)/Module.symvers
 
 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 +141,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_local/Makefile b/scst_local/Makefile
index bddd76198..566c78df1 100644
--- a/scst_local/Makefile
+++ b/scst_local/Makefile
@@ -42,14 +42,9 @@ 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)
+		KBUILD_EXTRA_SYMBOLS=$(SCST_DIR)/Module.symvers
 
 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..499b4212a 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
@@ -100,7 +95,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)"
+		KBUILD_EXTRA_SYMBOLS="$(SCST_DIR)/Module.symvers $(OFED_MODULE_SYMVERS)"
 
 install: all
 	@[ -z "$(DESTDIR)$(INSTALL_MOD_PATH)" ] && \
@@ -141,7 +136,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