diff --git a/ChangeLog b/ChangeLog
index bce32d760..ca072dbd8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-08-16  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/lib/posix_wrap/wchar.h: Fix wchar_t and mbstate_t conflict
+	on NetBSD and OpenBSD.
+
 2013-08-15  Vladimir Testov  <vladimir.testov@gmail.com>
 
 	* grub-core/gfxmenu/gui_list.c: Baseline misplacement fixed.
diff --git a/grub-core/lib/posix_wrap/wchar.h b/grub-core/lib/posix_wrap/wchar.h
index fb90cc044..7a27ecf91 100644
--- a/grub-core/lib/posix_wrap/wchar.h
+++ b/grub-core/lib/posix_wrap/wchar.h
@@ -21,6 +21,11 @@
 
 #include <grub/charset.h>
 
+#if defined(__NetBSD__) || defined(__OPENBSD__)
+#define wchar_t grub_posix_wchar_t
+#define mbstate_t grub_posix_mbstate_t
+#endif
+
 /* UCS-4.  */
 typedef grub_int32_t wint_t;
 enum