diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index 4e092b5b2..8be81c377 100644
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,7 @@
+2009-04-06  Corinna Vinschen  <corinna@vinschen.de>
+
+	* libc/locale/locale.c (loadlocale): Set mbc_max to 3 for EUCJP.
+
 2009-04-04  Corinna Vinschen  <corinna@vinschen.de>
 
 	* libc/stdlib/wcstombs.c: Fix datatypes in documentation.
diff --git a/newlib/libc/locale/locale.c b/newlib/libc/locale/locale.c
index e93f78021..b5a0ee74c 100644
--- a/newlib/libc/locale/locale.c
+++ b/newlib/libc/locale/locale.c
@@ -468,7 +468,7 @@ loadlocale(struct _reent *p, int category)
       if (!strcmp (charset, "EUCJP") || !strcmp (charset, "eucJP"))
 	{
 	  strcpy (charset, "EUCJP");
-	  mbc_max = 2;
+	  mbc_max = 3;
 #ifdef _MB_CAPABLE
 	  l_wctomb = __eucjp_wctomb;
 	  l_mbtowc = __eucjp_mbtowc;