diff --git a/debian/changelog b/debian/changelog
index b7cccce31..64acef296 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -74,6 +74,7 @@ linux-2.6 (2.6.25~rc5-1~experimental.1) UNRELEASED; urgency=low
   * Enable AF_RXRPC and RXKAD.
   * Disable R3964.
   * [hppa] Enable several filesystems.
+  * Make NLS modular.
 
  -- Bastian Blank <waldi@debian.org>  Tue, 26 Feb 2008 23:59:55 -0700
 
diff --git a/debian/config/config b/debian/config/config
index 4ed47de90..d5988fca8 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -1723,7 +1723,7 @@ CONFIG_NCPFS_EXTRAS=y
 ##
 ## file: fs/nls/Kconfig
 ##
-CONFIG_NLS=y
+CONFIG_NLS=m
 CONFIG_NLS_DEFAULT="utf8"
 CONFIG_NLS_CODEPAGE_437=m
 CONFIG_NLS_CODEPAGE_737=m