diff -r 7e19c1de65cd -r c5a2e4ee7fb8 config/libc/uClibc.in.2
--- a/config/libc/uClibc.in.2	Sat Jul 03 01:15:28 2010 +0200
+++ b/config/libc/uClibc.in.2	Mon Jul 26 00:07:17 2010 +0200
@@ -36,3 +36,34 @@
     default ""      if THREADS_NPTL
     default "old"   if LIBC_UCLIBC_LNXTHRD_OLD
     default "new"   if LIBC_UCLIBC_LNXTHRD_NEW
+
+config LIBC_UCLIBC_LOCALES
+    bool
+    select LIBC_UCLIBC_WCHAR
+    prompt "Add support for locales"
+    default n
+    help
+      Say y if you want uClibc to support localisation.
+
+      Note that seems to be broken on recent uClibc releases.
+
+config LIBC_UCLIBC_LOCALES_PREGEN_DATA
+    bool
+    prompt "Use pregen locales"
+    depends on LIBC_UCLIBC_LOCALES
+    default y
+    help
+      If you see issues with using pre-generated locales data,
+      you can try switching this off.
+
+      If so, please report the issue, so we can default this
+      to off if too many people complain.
+
+config LIBC_UCLIBC_WCHAR
+    bool
+    prompt "Add support for WCHAR"
+    default n
+    help
+      Say y if you want uClibc to support WCHAR.
+
+      Maybe this is needed, if you're building a C++-Compiler