Index: toolchain/Config.in
===================================================================
--- toolchain/Config.in (revision 6726)
+++ toolchain/Config.in (working copy)
@@ -35,6 +35,13 @@
        help
                Enable if you need full C99 math in libm
 
+config C99_LOCALE
+    bool
+    prompt "Enable C99 lacale support" if TOOLCHAINOPTS
+    default n
+    help
+        uClibc now has full ANSI/ISO C99 locale support (except for wcsftime() 
and collating items in regex).  Be aware that enabling this option will make uCl
ibc much larger.
+
 config SOFT_FLOAT
        bool
        prompt "Use software floating point by default" if TOOLCHAINOPTS
Index: toolchain/uClibc/Makefile
===================================================================
--- toolchain/uClibc/Makefile   (revision 6726)
+++ toolchain/uClibc/Makefile   (working copy)
@@ -56,6 +56,15 @@
 ifeq ($(CONFIG_C99_MATH),y)
        $(SED) 's,.*DO_C99_MATH.*,DO_C99_MATH=y,g' $(PKG_BUILD_DIR)/.config
 endif
+ifeq ($(CONFIG_C99_LOCALE),y)
+       $(SED) 's,.*UCLIBC_HAS_LOCALE.*,UCLIBC_HAS_LOCALE=y,g' $(PKG_BUILD_DIR)/
.config
+       echo 'UCLIBC_PREGENERATED_LOCALE_DATA=y' >> $(PKG_BUILD_DIR)/.config
+       echo 'UCLIBC_DOWNLOAD_PREGENERATED_LOCALE_DATA=y' >> $(PKG_BUILD_DIR)/.c
onfig
+       echo 'UCLIBC_HAS_XLOCALE=n' >> $(PKG_BUILD_DIR)/.config
+       echo 'UCLIBC_HAS_GLIBC_DIGIT_GROUPING=n' >> $(PKG_BUILD_DIR)/.config
+       echo 'UCLIBC_HAS_GETTEXT_AWARENESS=n' >> $(PKG_BUILD_DIR)/.config
+endif
+
        mkdir -p $(TOOLCHAIN_BUILD_DIR)/uClibc_dev/usr/include
        mkdir -p $(TOOLCHAIN_BUILD_DIR)/uClibc_dev/usr/lib
        mkdir -p $(TOOLCHAIN_BUILD_DIR)/uClibc_dev/lib