diff --git a/qla_isp/Makefile b/qla_isp/Makefile
index 3b949dfbf..83f803d25 100644
--- a/qla_isp/Makefile
+++ b/qla_isp/Makefile
@@ -1,5 +1,9 @@
+ifndef KVER
+KVER = $(shell uname -r)
+endif
+
 ifndef KDIR
-KDIR := /lib/modules/$(shell uname -r)/build
+KDIR := /lib/modules/$(KVER)/build
 endif
 
 export KDIR
diff --git a/qla_isp/linux-2.6/Makefile b/qla_isp/linux-2.6/Makefile
index 5bf337e38..ee0db7a56 100644
--- a/qla_isp/linux-2.6/Makefile
+++ b/qla_isp/linux-2.6/Makefile
@@ -47,7 +47,7 @@ tgt:	links Modules.symvers Module.symvers
 clean:
 	@$(MAKE) -C ${LINUX} M=${CURDIR}/build clean
 	@$(MAKE) -C build clean_links
-	@$(RM) tags
+	@$(RM) tags Modules.symvers Module.symvers
 
 extraclean: clean