diff --git a/ChangeLog b/ChangeLog
index c92e91aa9..ce3b20192 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-01-14  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/lib/posix_wrap/stdlib.h (MB_CUR_MAX): Moved from here ...
+	* grub-core/lib/posix_wrap/wchar.h (MB_CUR_MAX): ... here. Value fixed.
+
 2012-01-14  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/fs/fshelp.c (grub_fshelp_find_file): Use grub_strcasecmp
diff --git a/grub-core/lib/posix_wrap/stdlib.h b/grub-core/lib/posix_wrap/stdlib.h
index b35e21bb8..7cfc63a51 100644
--- a/grub-core/lib/posix_wrap/stdlib.h
+++ b/grub-core/lib/posix_wrap/stdlib.h
@@ -52,6 +52,4 @@ abort (void)
   grub_abort ();
 }
 
-#define MB_CUR_MAX 6
-
 #endif
diff --git a/grub-core/lib/posix_wrap/wchar.h b/grub-core/lib/posix_wrap/wchar.h
index a696643de..371133880 100644
--- a/grub-core/lib/posix_wrap/wchar.h
+++ b/grub-core/lib/posix_wrap/wchar.h
@@ -28,8 +28,6 @@ enum
     WEOF = -1
   };
 
-#define MB_LEN_MAX 4
-
 /* UCS-4.  */
 typedef grub_int32_t wchar_t;
 
@@ -38,6 +36,10 @@ typedef struct mbstate {
   int count;
 } mbstate_t;
 
+/* UTF-8. */
+#define MB_CUR_MAX 4
+#define MB_LEN_MAX 4
+
 static inline size_t
 mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps)
 {