diff --git a/package/kernel/modules/fs.mk b/package/kernel/modules/fs.mk
index de0bd54ce04..ad2f9c2b804 100644
--- a/package/kernel/modules/fs.mk
+++ b/package/kernel/modules/fs.mk
@@ -7,10 +7,6 @@
 
 FS_MENU:=Filesystems
 
-define AddDepends/nls
-  DEPENDS:= +!LINUX_2_4:kmod-nls-base
-endef
-
 define KernelPackage/fs-cifs
   SUBMENU:=$(FS_MENU)
   TITLE:=CIFS support
@@ -393,238 +389,3 @@ define KernelPackage/fs-autofs4/description
 endef
 
 $(eval $(call KernelPackage,fs-autofs4))
-
-
-define KernelPackage/nls-base
-  SUBMENU:=$(FS_MENU)
-  TITLE:=Native Language Support
-  KCONFIG:=CONFIG_NLS
-  FILES:=$(LINUX_DIR)/fs/nls/nls_base.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,20,nls_base,1)
-endef
-
-define KernelPackage/nls-base/description
- Kernel module for NLS (Native Language Support)
-endef
-
-$(eval $(call KernelPackage,nls-base))
-
-
-define KernelPackage/nls-cp437
-  SUBMENU:=$(FS_MENU)
-  TITLE:=Codepage 437 (United States, Canada)
-  KCONFIG:=CONFIG_NLS_CODEPAGE_437
-  FILES:=$(LINUX_DIR)/fs/nls/nls_cp437.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,25,nls_cp437)
-$(call AddDepends/nls)
-endef
-
-
-define KernelPackage/nls-cp437/description
- Kernel module for NLS Codepage 437 (United States, Canada)
-endef
-
-$(eval $(call KernelPackage,nls-cp437))
-
-
-define KernelPackage/nls-cp850
-  SUBMENU:=$(FS_MENU)
-  TITLE:=Codepage 850 (Europe)
-  KCONFIG:=CONFIG_NLS_CODEPAGE_850
-  FILES:=$(LINUX_DIR)/fs/nls/nls_cp850.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,25,nls_cp850)
-$(call AddDepends/nls)
-endef
-
-
-define KernelPackage/nls-cp850/description
- Kernel module for NLS Codepage 850 (Europe)
-endef
-
-$(eval $(call KernelPackage,nls-cp850))
-
-
-define KernelPackage/nls-cp852
-  SUBMENU:=$(FS_MENU)
-  TITLE:=Codepage 852 (Europe)
-  KCONFIG:=CONFIG_NLS_CODEPAGE_852
-  FILES:=$(LINUX_DIR)/fs/nls/nls_cp852.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,25,nls_cp852)
-$(call AddDepends/nls)
-endef
-
-
-define KernelPackage/nls-cp852/description
- Kernel module for NLS Codepage 852 (Europe)
-endef
-
-$(eval $(call KernelPackage,nls-cp852))
-
-
-define KernelPackage/nls-cp866
-  SUBMENU:=$(FS_MENU)
-  TITLE:=Codepage 866 (Cyrillic)
-  KCONFIG:=CONFIG_NLS_CODEPAGE_866
-  FILES:=$(LINUX_DIR)/fs/nls/nls_cp866.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,25,nls_cp866)
-$(call AddDepends/nls)
-endef
-
-
-define KernelPackage/nls-cp866/description
-  Kernel module for NLS Codepage 866 (Cyrillic)
-endef
-
-$(eval $(call KernelPackage,nls-cp866))
-
-
-define KernelPackage/nls-cp1250
-  SUBMENU:=$(FS_MENU)
-  TITLE:=Codepage 1250 (Eastern Europe)
-  KCONFIG:=CONFIG_NLS_CODEPAGE_1250
-  FILES:=$(LINUX_DIR)/fs/nls/nls_cp1250.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,25,nls_cp1250)
-$(call AddDepends/nls)
-endef
-
-
-define KernelPackage/nls-cp1250/description
- Kernel module for NLS Codepage 1250 (Eastern Europe)
-endef
-
-$(eval $(call KernelPackage,nls-cp1250))
-
-
-define KernelPackage/nls-cp1251
-  SUBMENU:=$(FS_MENU)
-  TITLE:=Codepage 1251 (Russian)
-  KCONFIG:=CONFIG_NLS_CODEPAGE_1251
-  FILES:=$(LINUX_DIR)/fs/nls/nls_cp1251.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,25,nls_cp1251)
-$(call AddDepends/nls)
-endef
-
-
-define KernelPackage/nls-cp1251/description
- Kernel module for NLS Codepage 1251 (Russian)
-endef
-
-$(eval $(call KernelPackage,nls-cp1251))
-
-
-define KernelPackage/nls-iso8859-1
-  SUBMENU:=$(FS_MENU)
-  TITLE:=ISO 8859-1 (Latin 1; Western European Languages)
-  KCONFIG:=CONFIG_NLS_ISO8859_1
-  FILES:=$(LINUX_DIR)/fs/nls/nls_iso8859-1.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,25,nls_iso8859-1)
-$(call AddDepends/nls)
-endef
-
-
-define KernelPackage/nls-iso8859-1/description
- Kernel module for NLS ISO 8859-1 (Latin 1)
-endef
-
-$(eval $(call KernelPackage,nls-iso8859-1))
-
-
-define KernelPackage/nls-iso8859-2
-  SUBMENU:=$(FS_MENU)
-  TITLE:=ISO 8859-2 (Latin 2; Central European Languages)
-  KCONFIG:=CONFIG_NLS_ISO8859_2
-  FILES:=$(LINUX_DIR)/fs/nls/nls_iso8859-2.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,25,nls_iso8859-2)
-$(call AddDepends/nls)
-endef
-
-
-define KernelPackage/nls-iso8859-2/description
- Kernel module for NLS ISO 8859-2 (Latin 2)
-endef
-
-$(eval $(call KernelPackage,nls-iso8859-2))
-
-
-define KernelPackage/nls-iso8859-15
-  SUBMENU:=$(FS_MENU)
-  TITLE:=ISO 8859-15 (Latin 9; Western, with Euro symbol)
-  KCONFIG:=CONFIG_NLS_ISO8859_15
-  FILES:=$(LINUX_DIR)/fs/nls/nls_iso8859-15.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,25,nls_iso8859-15)
-$(call AddDepends/nls)
-endef
-
-
-define KernelPackage/nls-iso8859-15/description
- Kernel module for NLS ISO 8859-15 (Latin 9)
-endef
-
-$(eval $(call KernelPackage,nls-iso8859-15))
-
-
-define KernelPackage/nls-koi8r
-  SUBMENU:=$(FS_MENU)
-  TITLE:=KOI8-R (Russian)
-  KCONFIG:=CONFIG_NLS_KOI8_R
-  FILES:=$(LINUX_DIR)/fs/nls/nls_koi8-r.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,25,nls_koi8-r)
-$(call AddDepends/nls)
-endef
-
-
-define KernelPackage/nls-koi8r/description
- Kernel module for NLS KOI8-R (Russian)
-endef
-
-$(eval $(call KernelPackage,nls-koi8r))
-
-
-define KernelPackage/nls-utf8
-  SUBMENU:=$(FS_MENU)
-  TITLE:=UTF-8
-  KCONFIG:=CONFIG_NLS_UTF8
-  FILES:=$(LINUX_DIR)/fs/nls/nls_utf8.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,25,nls_utf8)
-$(call AddDepends/nls)
-endef
-
-define KernelPackage/nls-utf8/description
- Kernel module for NLS UTF-8
-endef
-
-$(eval $(call KernelPackage,nls-utf8))
-
-
-define KernelPackage/nls-iso8859-13
-  SUBMENU:=$(FS_MENU)
-  TITLE:=ISO 8859-13 (Latin 7; Baltic)
-  KCONFIG:=CONFIG_NLS_ISO8859_13
-  FILES:=$(LINUX_DIR)/fs/nls/nls_iso8859-13.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,25,nls_iso8859-13)
-$(call AddDepends/nls)
-endef
-
-
-define KernelPackage/nls-iso8859-13/description
- Kernel module for NLS ISO 8859-13 (Latin 7; Baltic)
-endef
-
-$(eval $(call KernelPackage,nls-iso8859-13))
-
-define KernelPackage/nls-cp775
-  SUBMENU:=$(FS_MENU)
-  TITLE:=Codepage 775 (Baltic Rim)
-  KCONFIG:=CONFIG_NLS_CODEPAGE_775
-  FILES:=$(LINUX_DIR)/fs/nls/nls_cp775.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,25,nls_cp775)
-$(call AddDepends/nls)
-endef
-
-
-define KernelPackage/nls-cp775/description
- Kernel module for NLS Codepage 775 (Baltic Rim)
-endef
-
-$(eval $(call KernelPackage,nls-cp775))
-
diff --git a/package/kernel/modules/nls.mk b/package/kernel/modules/nls.mk
new file mode 100644
index 00000000000..74eeaf81914
--- /dev/null
+++ b/package/kernel/modules/nls.mk
@@ -0,0 +1,233 @@
+#
+# Copyright (C) 2006-2010 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+define AddDepends/nls
+  SUBMENU:=Native Language Support
+  DEPENDS:= +!LINUX_2_4:kmod-nls-base
+endef
+
+define KernelPackage/nls-base
+  SUBMENU:=Native Language Support
+  TITLE:=Native Language Support
+  KCONFIG:=CONFIG_NLS
+  FILES:=$(LINUX_DIR)/fs/nls/nls_base.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,20,nls_base,1)
+endef
+
+define KernelPackage/nls-base/description
+ Kernel module for NLS (Native Language Support)
+endef
+
+$(eval $(call KernelPackage,nls-base))
+
+
+define KernelPackage/nls-cp437
+  SUBMENU:=$(FS_MENU)
+  TITLE:=Codepage 437 (United States, Canada)
+  KCONFIG:=CONFIG_NLS_CODEPAGE_437
+  FILES:=$(LINUX_DIR)/fs/nls/nls_cp437.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,25,nls_cp437)
+$(call AddDepends/nls)
+endef
+
+define KernelPackage/nls-cp437/description
+ Kernel module for NLS Codepage 437 (United States, Canada)
+endef
+
+$(eval $(call KernelPackage,nls-cp437))
+
+
+define KernelPackage/nls-cp775
+  SUBMENU:=$(FS_MENU)
+  TITLE:=Codepage 775 (Baltic Rim)
+  KCONFIG:=CONFIG_NLS_CODEPAGE_775
+  FILES:=$(LINUX_DIR)/fs/nls/nls_cp775.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,25,nls_cp775)
+$(call AddDepends/nls)
+endef
+
+define KernelPackage/nls-cp775/description
+ Kernel module for NLS Codepage 775 (Baltic Rim)
+endef
+
+$(eval $(call KernelPackage,nls-cp775))
+
+
+define KernelPackage/nls-cp850
+  SUBMENU:=$(FS_MENU)
+  TITLE:=Codepage 850 (Europe)
+  KCONFIG:=CONFIG_NLS_CODEPAGE_850
+  FILES:=$(LINUX_DIR)/fs/nls/nls_cp850.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,25,nls_cp850)
+$(call AddDepends/nls)
+endef
+
+define KernelPackage/nls-cp850/description
+ Kernel module for NLS Codepage 850 (Europe)
+endef
+
+$(eval $(call KernelPackage,nls-cp850))
+
+
+define KernelPackage/nls-cp852
+  SUBMENU:=$(FS_MENU)
+  TITLE:=Codepage 852 (Europe)
+  KCONFIG:=CONFIG_NLS_CODEPAGE_852
+  FILES:=$(LINUX_DIR)/fs/nls/nls_cp852.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,25,nls_cp852)
+$(call AddDepends/nls)
+endef
+
+define KernelPackage/nls-cp852/description
+ Kernel module for NLS Codepage 852 (Europe)
+endef
+
+$(eval $(call KernelPackage,nls-cp852))
+
+
+define KernelPackage/nls-cp866
+  SUBMENU:=$(FS_MENU)
+  TITLE:=Codepage 866 (Cyrillic)
+  KCONFIG:=CONFIG_NLS_CODEPAGE_866
+  FILES:=$(LINUX_DIR)/fs/nls/nls_cp866.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,25,nls_cp866)
+$(call AddDepends/nls)
+endef
+
+define KernelPackage/nls-cp866/description
+  Kernel module for NLS Codepage 866 (Cyrillic)
+endef
+
+$(eval $(call KernelPackage,nls-cp866))
+
+
+define KernelPackage/nls-cp1250
+  SUBMENU:=$(FS_MENU)
+  TITLE:=Codepage 1250 (Eastern Europe)
+  KCONFIG:=CONFIG_NLS_CODEPAGE_1250
+  FILES:=$(LINUX_DIR)/fs/nls/nls_cp1250.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,25,nls_cp1250)
+$(call AddDepends/nls)
+endef
+
+define KernelPackage/nls-cp1250/description
+ Kernel module for NLS Codepage 1250 (Eastern Europe)
+endef
+
+$(eval $(call KernelPackage,nls-cp1250))
+
+
+define KernelPackage/nls-cp1251
+  SUBMENU:=$(FS_MENU)
+  TITLE:=Codepage 1251 (Russian)
+  KCONFIG:=CONFIG_NLS_CODEPAGE_1251
+  FILES:=$(LINUX_DIR)/fs/nls/nls_cp1251.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,25,nls_cp1251)
+$(call AddDepends/nls)
+endef
+
+define KernelPackage/nls-cp1251/description
+ Kernel module for NLS Codepage 1251 (Russian)
+endef
+
+$(eval $(call KernelPackage,nls-cp1251))
+
+
+define KernelPackage/nls-iso8859-1
+  SUBMENU:=$(FS_MENU)
+  TITLE:=ISO 8859-1 (Latin 1; Western European Languages)
+  KCONFIG:=CONFIG_NLS_ISO8859_1
+  FILES:=$(LINUX_DIR)/fs/nls/nls_iso8859-1.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,25,nls_iso8859-1)
+$(call AddDepends/nls)
+endef
+
+define KernelPackage/nls-iso8859-1/description
+ Kernel module for NLS ISO 8859-1 (Latin 1)
+endef
+
+$(eval $(call KernelPackage,nls-iso8859-1))
+
+
+define KernelPackage/nls-iso8859-2
+  SUBMENU:=$(FS_MENU)
+  TITLE:=ISO 8859-2 (Latin 2; Central European Languages)
+  KCONFIG:=CONFIG_NLS_ISO8859_2
+  FILES:=$(LINUX_DIR)/fs/nls/nls_iso8859-2.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,25,nls_iso8859-2)
+$(call AddDepends/nls)
+endef
+
+define KernelPackage/nls-iso8859-2/description
+ Kernel module for NLS ISO 8859-2 (Latin 2)
+endef
+
+$(eval $(call KernelPackage,nls-iso8859-2))
+
+
+define KernelPackage/nls-iso8859-13
+  SUBMENU:=$(FS_MENU)
+  TITLE:=ISO 8859-13 (Latin 7; Baltic)
+  KCONFIG:=CONFIG_NLS_ISO8859_13
+  FILES:=$(LINUX_DIR)/fs/nls/nls_iso8859-13.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,25,nls_iso8859-13)
+$(call AddDepends/nls)
+endef
+
+define KernelPackage/nls-iso8859-13/description
+ Kernel module for NLS ISO 8859-13 (Latin 7; Baltic)
+endef
+
+$(eval $(call KernelPackage,nls-iso8859-13))
+
+
+define KernelPackage/nls-iso8859-15
+  SUBMENU:=$(FS_MENU)
+  TITLE:=ISO 8859-15 (Latin 9; Western, with Euro symbol)
+  KCONFIG:=CONFIG_NLS_ISO8859_15
+  FILES:=$(LINUX_DIR)/fs/nls/nls_iso8859-15.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,25,nls_iso8859-15)
+$(call AddDepends/nls)
+endef
+
+define KernelPackage/nls-iso8859-15/description
+ Kernel module for NLS ISO 8859-15 (Latin 9)
+endef
+
+$(eval $(call KernelPackage,nls-iso8859-15))
+
+
+define KernelPackage/nls-koi8r
+  SUBMENU:=$(FS_MENU)
+  TITLE:=KOI8-R (Russian)
+  KCONFIG:=CONFIG_NLS_KOI8_R
+  FILES:=$(LINUX_DIR)/fs/nls/nls_koi8-r.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,25,nls_koi8-r)
+$(call AddDepends/nls)
+endef
+
+define KernelPackage/nls-koi8r/description
+ Kernel module for NLS KOI8-R (Russian)
+endef
+
+$(eval $(call KernelPackage,nls-koi8r))
+
+
+define KernelPackage/nls-utf8
+  SUBMENU:=$(FS_MENU)
+  TITLE:=UTF-8
+  KCONFIG:=CONFIG_NLS_UTF8
+  FILES:=$(LINUX_DIR)/fs/nls/nls_utf8.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,25,nls_utf8)
+$(call AddDepends/nls)
+endef
+
+define KernelPackage/nls-utf8/description
+ Kernel module for NLS UTF-8
+endef
+
+$(eval $(call KernelPackage,nls-utf8))