diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 1bd8cd86b..d695f4b7b 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-27  Corinna Vinschen  <corinna@vinschen.de>
+
+	* nlsfuncs.cc (__set_charset_from_locale):  Set default charset for
+	locales defaulting to codepage 936 to GB2312.
+
 2010-03-22  Corinna Vinschen  <corinna@vinschen.de>
 
 	* fhandler_socket.cc (fhandler_socket::evaluate_events): Make erase
diff --git a/winsup/cygwin/nlsfuncs.cc b/winsup/cygwin/nlsfuncs.cc
index 51cc465f7..3f2279a18 100644
--- a/winsup/cygwin/nlsfuncs.cc
+++ b/winsup/cygwin/nlsfuncs.cc
@@ -1042,7 +1042,7 @@ __set_charset_from_locale (const char *locale, char *charset)
       cs = "EUCJP";
       break;
     case 936:
-      cs = "GBK";
+      cs = "GB2312";
       break;
     case 949:
       cs = "EUCKR";