diff --git a/libcharset/lib/ChangeLog b/libcharset/lib/ChangeLog
index af3607b..f921b9b 100644
--- a/libcharset/lib/ChangeLog
+++ b/libcharset/lib/ChangeLog
@@ -1,5 +1,9 @@
 2009-12-12  Bruno Haible  <bruno@clisp.org>
 
+	* localcharset.c (locale_charset): Add comment about use of GetACP.
+
+2009-12-12  Bruno Haible  <bruno@clisp.org>
+
 	* config.charset: Untabify.
 	* localcharset.c: Untabify.
 
diff --git a/libcharset/lib/localcharset.c b/libcharset/lib/localcharset.c
index 5f13f84..8506eed 100644
--- a/libcharset/lib/localcharset.c
+++ b/libcharset/lib/localcharset.c
@@ -450,7 +450,19 @@
 
   static char buf[2 + 10 + 1];
 
-  /* Woe32 has a function returning the locale's codepage as a number.  */
+  /* Woe32 has a function returning the locale's codepage as a number.
+     When the output goes to a console window, in Windows 95, it would have
+     been appropriate to use GetOEMCP() instead of GetACP().  But this has
+     been corrected: In Windows XP SP3, consoles accept output in the
+     GetACP() encoding.  The GetConsoleOutputCP() function still returns
+     the same as GetOEMCP() (not GetACP()!), but the font handling in the
+     console actually uses the GetACP() encoding.  If you want to "correct"
+     this by calling SetConsoleOutputCP(GetACP()), then for a TrueType font
+     it has no visible effect on the displayed glyphs, whereas when a raster
+     font is in use, the console performs an extra conversion from GetOEMCP()
+     to GetACP() encoding, thus changing the effective codepage of the
+     console from GetACP() to GetOEMCP()!  In summary, GetConsoleOutputCP()
+     and SetConsoleOutputCP() are now completely broken.  */
   sprintf (buf, "CP%u", GetACP ());
   codeset = buf;