diff --git a/iscsi-scst/Makefile b/iscsi-scst/Makefile
index 0053745bb..9f4797595 100644
--- a/iscsi-scst/Makefile
+++ b/iscsi-scst/Makefile
@@ -69,7 +69,8 @@ endif
 clean:
 	$(MAKE) -C usr clean
 	$(MAKE) -C $(KDIR) SUBDIRS=$(shell pwd)/kernel clean
-	rm -f kernel/Modules.symvers kernel/Module.symvers
+	rm -f kernel/Modules.symvers kernel/Module.symvers \
+		kernel/Module.markers kernel/modules.order
 
 extraclean: clean
 
diff --git a/iscsi-scst/usr/Makefile b/iscsi-scst/usr/Makefile
index 49145a92c..7867ffefe 100644
--- a/iscsi-scst/usr/Makefile
+++ b/iscsi-scst/usr/Makefile
@@ -22,7 +22,8 @@ SRCS_ADM = iscsi_adm.c param.c
 OBJS_ADM = $(SRCS_ADM:.c=.o)
 
 CFLAGS += -O2 -fno-inline -Wall -Wstrict-prototypes -g -I../include
-PROGRAMS = iscsi-scstd iscsi-scst-adm
+PROGRAMS = iscsi-scstd
+# iscsi-scst-adm
 LIBS = -lcrypto
 
 all: $(PROGRAMS)
diff --git a/mpt/Makefile b/mpt/Makefile
index d421d950c..7a1231ec5 100644
--- a/mpt/Makefile
+++ b/mpt/Makefile
@@ -85,7 +85,8 @@ uninstall:
 endif
 
 clean:
-	rm -f *.o *.ko .*.cmd *.mod.c .*.d .depend *~ Modules.symvers Module.symvers
+	rm -f *.o *.ko .*.cmd *.mod.c .*.d .depend *~ Modules.symvers \
+		Module.symvers Module.markers modules.order
 	rm -rf .tmp_versions
 
 extraclean: clean
diff --git a/qla2x00t/Makefile b/qla2x00t/Makefile
index 2b9974015..f09ccb150 100644
--- a/qla2x00t/Makefile
+++ b/qla2x00t/Makefile
@@ -41,7 +41,8 @@ uninstall:
 endif
 
 clean:
-	rm -f *.o *.ko .*.cmd *.mod.c .*.d .depend *~ Modules.symvers Module.symvers
+	rm -f *.o *.ko .*.cmd *.mod.c .*.d .depend *~ Modules.symvers \
+		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 334bd9576..e906672ec 100644
--- a/qla2x00t/qla2x00-target/Makefile
+++ b/qla2x00t/qla2x00-target/Makefile
@@ -92,7 +92,8 @@ uninstall:
 endif
 
 clean:
-	rm -f *.o *.ko .*.cmd *.mod.c .*.d .depend *~ Modules.symvers Module.symvers
+	rm -f *.o *.ko .*.cmd *.mod.c .*.d .depend *~ Modules.symvers \
+		Module.symvers Module.markers modules.order
 	rm -rf .tmp_versions
 
 extraclean: clean
diff --git a/scst/src/Makefile b/scst/src/Makefile
index 2ef3dca1c..6e363729d 100644
--- a/scst/src/Makefile
+++ b/scst/src/Makefile
@@ -144,7 +144,8 @@ EXTRA_CFLAGS += -DDEBUG -g
 #EXTRA_CFLAGS += -DSCST_HIGHMEM
 
 clean:
-	rm -f *.o *.ko .*.cmd *.mod.c .*.d .depend Modules.symvers Module.symvers
+	rm -f *.o *.ko .*.cmd *.mod.c .*.d .depend Modules.symvers \
+		Module.symvers Module.markers modules.order
 	rm -rf .tmp_versions
 	cd $(DEV_HANDLERS_DIR) && $(MAKE) $@
 
diff --git a/scst/src/dev_handlers/Makefile b/scst/src/dev_handlers/Makefile
index dc468eebb..de4704487 100644
--- a/scst/src/dev_handlers/Makefile
+++ b/scst/src/dev_handlers/Makefile
@@ -74,7 +74,8 @@ EXTRA_CFLAGS += -DEXTRACHECKS
 EXTRA_CFLAGS += -DDEBUG -g
 
 clean:
-	rm -f *.o *.ko .*.cmd *.mod.c .*.d .depend Modules.symvers Module.symvers
+	rm -f *.o *.ko .*.cmd *.mod.c .*.d .depend Modules.symvers \
+		Module.symvers Module.markers modules.order
 	rm -rf .tmp_versions
 
 extraclean: clean
diff --git a/srpt/Makefile b/srpt/Makefile
index c2b3a0991..edb71deb2 100644
--- a/srpt/Makefile
+++ b/srpt/Makefile
@@ -50,7 +50,8 @@ endif
 
 clean:
 	$(MAKE) -C $(KDIR) SUBDIRS=$(shell pwd)/src clean
-	rm -f src/Modules.symvers src/Module.symvers
+	rm -f src/Modules.symvers src/Module.symvers src/Module.markers \
+		src/modules.order
 
 extraclean: clean