diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6c7d937c6f3..eb986b80d06 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2005-10-20  Geoffrey Keating  <geoffk@apple.com>
+
+	* doc/cpp.texi (Character sets): Document that we do support
+	input files to be in any character set.
+
 2006-02-23  Jeff Law  <law@redhat.com>
 
 	* tree.h (PHI_ARG_NONZERO): Remove.
diff --git a/gcc/doc/cpp.texi b/gcc/doc/cpp.texi
index e69394298e6..2a7101cd878 100644
--- a/gcc/doc/cpp.texi
+++ b/gcc/doc/cpp.texi
@@ -251,12 +251,8 @@ processing.  That set is what the C standard calls the @dfn{source}
 character set.  It must be isomorphic with ISO 10646, also known as
 Unicode.  CPP uses the UTF-8 encoding of Unicode.
 
-At present, GNU CPP does not implement conversion from arbitrary file
-encodings to the source character set.  Use of any encoding other than
-plain ASCII or UTF-8, except in comments, will cause errors.  Use of
-encodings that are not strict supersets of ASCII, such as Shift JIS,
-may cause errors even if non-ASCII characters appear only in comments.
-We plan to fix this in the near future.
+The character sets of the input files are specified using the
+@option{-finput-charset=} option.
 
 All preprocessing work (the subject of the rest of this manual) is
 carried out in the source character set.  If you request textual