diff --git a/include/kernel.mk b/include/kernel.mk
index d8f582c..bbd30b6 100644
--- a/include/kernel.mk
+++ b/include/kernel.mk
@@ -88,7 +88,9 @@ define ModuleAutoLoad
                                echo '# May be required for rootfs' ; \
                        } ; \
                        for mod in $$$$$$$$mods; do \
-                               echo "$$$$$$$$mod"; \
+                               [ ! -e $(2)/$(MODULES_SUBDIR)/$$$$$$$$mod.ko ] || { \
+                                       echo "$$$$$$$$mod"; \
+                               }; \
                        done \
                ) > $(2)/etc/modules.d/$$$$$$$$priority-$(1); \
                modules="$$$$$$$${modules:+$$$$$$$$modules }$$$$$$$$priority-$(1)"; \
@@ -147,11 +149,15 @@ $(call KernelPackage/$(1)/config)

   $(call KernelPackage/depends)

-  ifneq ($(if $(filter-out %=y %=n %=m,$(KCONFIG)),$(filter m,$(foreach c,$(filter-out %=y %=n %=m,$(KCONFIG)),$($(c)))),.),)
+  ifneq ($(if $(filter-out %=y %=n %=m,$(KCONFIG)),$(filter m y,$(foreach c,$(filter-out %=y %=n %=m,$(KCONFIG)),$($(c)))),.),)
     ifneq ($(strip $(FILES)),)
       define Package/kmod-$(1)/install
-                 mkdir -p $$(1)/$(MODULES_SUBDIR)
-                 $(CP) -L $$(FILES) $$(1)/$(MODULES_SUBDIR)/
+                 for mod in $$(FILES); do \
+                       [ ! -e $$$$$$$$mod ] || { \
+                               mkdir -p $$(1)/$(MODULES_SUBDIR) ; \
+                               $(CP) -L $$$$$$$$mod $$(1)/$(MODULES_SUBDIR)/ ; \
+                       }; \
+                 done
                  $(call ModuleAutoLoad,$(1),$$(1),$(AUTOLOAD))
                  $(call KernelPackage/$(1)/install,$$(1))
       endef