diff --git a/winsup/doc/ChangeLog b/winsup/doc/ChangeLog
index 370a5a376..6c3499711 100644
--- a/winsup/doc/ChangeLog
+++ b/winsup/doc/ChangeLog
@@ -1,3 +1,8 @@
+2009-03-25  Corinna Vinschen  <corinna@vinschen.de>
+
+	* new-features.sgml: Replace GB2312 with GBK.
+	* setup2.sgml: Ditto.
+
 2009-03-25  Corinna Vinschen  <corinna@vinschen.de>
 
 	* pathnames.sgml: Add a note that ASCII SO handling isn't foolproof
diff --git a/winsup/doc/new-features.sgml b/winsup/doc/new-features.sgml
index 3889efa6d..31410d1db 100644
--- a/winsup/doc/new-features.sgml
+++ b/winsup/doc/new-features.sgml
@@ -195,7 +195,7 @@
   in 1-16, except 12, "UTF-8", Windows codepages "CPxxx", with xxx in
   (437, 720, 737, 775, 850, 852, 855, 857, 858, 862, 866, 874, 1125,
   1250, 1251, 1252, 1253, 1254, 1255, 1256, 1257, 1258), "JIS", "SJIS",
-  "GB2312", "eucJP", "eucKR", and "Big5".  The leading language and territory
+  "GBK", "eucJP", "eucKR", and "Big5".  The leading language and territory
   part (en_US, for instance) is not used by Cygwin yet, but is required
   for POSIX compatibility.
 
diff --git a/winsup/doc/setup2.sgml b/winsup/doc/setup2.sgml
index 20718b955..5063df4ca 100644
--- a/winsup/doc/setup2.sgml
+++ b/winsup/doc/setup2.sgml
@@ -393,7 +393,7 @@ oif the "CPxxx" style charsets, always use them with the trailing "CP".</para>
     ISO-8859-16             -   (not available)
 
     SJIS                    932 (ANSI/OEM Japanese)
-    GB2312                  936 (ANSI/OEM Simplified Chinese, GBK)
+    GBK                     936 (ANSI/OEM Simplified Chinese)
     Big5                    950 (ANSI/OEM Traditional Chinese)
     JIS                   50220 (ISO2022 Japanese w/o halfwidth Katakana)
     eucJP                 51932 (EUC Japanese)