diff --git a/winsup/doc/ChangeLog b/winsup/doc/ChangeLog
index 23a26a2c0..b0c281e3a 100644
--- a/winsup/doc/ChangeLog
+++ b/winsup/doc/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-23  Corinna Vinschen  <corinna@vinschen.de>
+
+	* setup2.sgml (setup-locale-charsetlist): Add CP932.  Change description
+	for SJIS.
+
 2010-01-23  Corinna Vinschen  <corinna@vinschen.de>
 
 	* setup2.sgml (setup-locale-charsetlist): Add ASCII and TIS-620.  Add
diff --git a/winsup/doc/setup2.sgml b/winsup/doc/setup2.sgml
index fa2a34e0d..e45a658eb 100644
--- a/winsup/doc/setup2.sgml
+++ b/winsup/doc/setup2.sgml
@@ -521,6 +521,7 @@ of the "CPxxx" style charsets, always use them with the trailing "CP".</para>
     CP862                   862 (OEM Hebrew)
     CP866                   866 (OEM Russian)
     CP874                   874 (ANSI/OEM Thai)
+    CP932		    932 (Shift_JIS, not exactly identical to SJIS)
     CP1125                 1125 (OEM Ukraine)
     CP1250                 1250 (ANSI Central European)
     CP1251                 1251 (ANSI Cyrillic)
@@ -550,7 +551,7 @@ of the "CPxxx" style charsets, always use them with the trailing "CP".</para>
 
     KOI8-R                20866 (KOI8-R Russian Cyrillic)
     KOI8-U                21866 (KOI8-U Ukrainian Cyrillic)
-    SJIS                    932 (ANSI/OEM Japanese)
+    SJIS                      - (not available, almost, but not exactly CP932)
     GBK                     936 (ANSI/OEM Simplified Chinese)
     Big5                    950 (ANSI/OEM Traditional Chinese)
     EUCJP or euc-JP       20932 (EUC Japanese)