diff --git a/winsup/doc/ChangeLog b/winsup/doc/ChangeLog
index c769f5721..b3caa700f 100644
--- a/winsup/doc/ChangeLog
+++ b/winsup/doc/ChangeLog
@@ -1,3 +1,9 @@
+2009-04-06  Corinna Vinschen  <corinna@vinschen.de>
+
+	* new-features.sgml (ov-new1.7-posix): Remove JIS from supported
+	charsets.
+	* setup2.sgml (setup-locale-charsetlist): Ditto.
+
 2009-04-06  Corinna Vinschen  <corinna@vinschen.de>
 
 	* setup2.sgml (setup-locale-problems): Change title to be more clear
diff --git a/winsup/doc/new-features.sgml b/winsup/doc/new-features.sgml
index 205eadbcd..3aee3963a 100644
--- a/winsup/doc/new-features.sgml
+++ b/winsup/doc/new-features.sgml
@@ -198,7 +198,7 @@
   The full list of supported character sets: "ASCII", "ISO-8859-x" with x
   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",
+  1250, 1251, 1252, 1253, 1254, 1255, 1256, 1257, 1258), "SJIS",
   "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 ced91c17a..a1a821472 100644
--- a/winsup/doc/setup2.sgml
+++ b/winsup/doc/setup2.sgml
@@ -403,9 +403,8 @@ oif the "CPxxx" style charsets, always use them with the trailing "CP".</para>
     SJIS                    932 (ANSI/OEM Japanese)
     GBK                     936 (ANSI/OEM Simplified Chinese)
     Big5                    950 (ANSI/OEM Traditional Chinese)
-    JIS                   50220 (ISO2022 Japanese w/o halfwidth Katakana)
-    eucJP                 51932 (EUC Japanese)
-    eucKR                 51949 (EUC Korean)
+    eucJP                 20932 (EUC Japanese)
+    eucKR                   949 (EUC Korean)
 
     UTF-8                 65001 (UTF-8)
 </screen>