diff --git a/make/environment-linux.mk b/make/environment-linux.mk
index f8b11236..0aeed4bb 100644
--- a/make/environment-linux.mk
+++ b/make/environment-linux.mk
@@ -247,7 +247,7 @@ endif
 
 define LINUX_RUN_DEPMOD
 	if test -d $(TARGET_modulesdir) && grep -q "CONFIG_MODULES=y" $(KERNEL_OBJ_DIR)/.config; then \
-		PATH=$(PATH):/sbin:/usr/sbin depmod -a -b $(TARGET_DIR) $(KERNEL_VER); \
+		PATH=$(PATH):/sbin:/usr/sbin depmod -a -b $(TARGET_DIR) $(KERNEL_VERSION); \
 	fi
 endef
 
diff --git a/make/linux-kernel.mk b/make/linux-kernel.mk
index c16798b3..d2f246bb 100644
--- a/make/linux-kernel.mk
+++ b/make/linux-kernel.mk
@@ -299,9 +299,7 @@ kernel-modules-coolstream-hd1: kernel-coolstream
 	done;
 	rm -f $(TARGET_modulesdir)/usb-storage.ko # already builtin
 	$(LINUX_RUN_DEPMOD)
-	mv $(TARGET_modulesdir)/modules.dep $(TARGET_modulesdir)/.modules.dep
-	rm $(TARGET_modulesdir)/modules.*
-	mv $(TARGET_modulesdir)/.modules.dep $(TARGET_modulesdir)/modules.dep
+	find $(TARGET_modulesdir) -type f -name 'modules.*' -not -name 'modules.dep' -print0 | xargs -0 rm --
 	$(TOUCH)
 
 kernel-modules-coolstream-hd2: kernel-coolstream