diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index d7d92aa1a..30f3d37ca 100644
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,8 @@
+2012-03-29  Corinna Vinschen  <vinschen@redhat.com>
+
+	* libc/locale/locale.c (__mb_cur_max): On Cygwin, align default value
+	with default UTF-8 charset.
+
 2012-03-26  Corinna Vinschen  <vinschen@redhat.com>
 
 	* libc/stdio/findfp.c (__sinit): Set __sdidinit last.
diff --git a/newlib/libc/locale/locale.c b/newlib/libc/locale/locale.c
index ee24872b2..8e2b121bc 100644
--- a/newlib/libc/locale/locale.c
+++ b/newlib/libc/locale/locale.c
@@ -188,7 +188,11 @@ No supporting OS subroutines are required.
 #define _LC_LAST      7
 #define ENCODING_LEN 31
 
+#ifdef __CYGWIN__ /* Cygwin starts with LC_CTYPE set to "C.UTF-8". */
+int __EXPORT __mb_cur_max = 6;
+#else
 int __EXPORT __mb_cur_max = 1;
+#endif
 
 int __nlocale_changed = 0;
 int __mlocale_changed = 0;