diff --git a/winsup/doc/ChangeLog b/winsup/doc/ChangeLog
index badf990fb..f6023fa48 100644
--- a/winsup/doc/ChangeLog
+++ b/winsup/doc/ChangeLog
@@ -1,3 +1,8 @@
+2009-09-24  Eric Blake  <ebb9@byu.net>
+
+	* setup2.sgml (setup-locale-problems): Document how to install
+	non-default charsets.
+
 2009-09-21  Corinna Vinschen  <corinna@vinschen.de>
 
 	* new-features.sgml (ov-new1.7-file): Add new hardlink behaviour on
diff --git a/winsup/doc/setup2.sgml b/winsup/doc/setup2.sgml
index fa63a9e23..55c93cf5a 100644
--- a/winsup/doc/setup2.sgml
+++ b/winsup/doc/setup2.sgml
@@ -367,6 +367,14 @@ worked all these years before, maybe it's because you switched to
 another character set.  This doesn't occur with symlinks created with
 Cygwin 1.7 or later.  </para>
 
+<para>Another problem you might encounter is that older versions of
+Windows did not install all charsets by default.  If you are running
+Windows XP or older, you can open the "Regional and Language Options"
+portion of the Control Panel, select the "Advanced" tab, and select
+entries from the "Code page conversion tables" list.  The following
+entries are useful to cygwin: 932/SJIS, 936/EUC-KR, 949/GBK, 950/Big5,
+20932/EUC-JP.</para>
+
 </sect2>
 
 <sect2 id="setup-locale-missing"><title>What does not work?</title>