diff --git a/doc/TODO b/doc/TODO
index 6314ee7c8d1bc3210479f83571afb6c1256b7904..fcd462ffd14526f6f7aa013ac1dc05a13c25d505 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -2,7 +2,7 @@
 PostgreSQL TODO List
 ====================
 Current maintainer:	Bruce Momjian (bruce@momjian.us)
-Last updated:		Mon Sep 18 10:56:04 EDT 2006
+Last updated:		Mon Sep 18 11:52:19 EDT 2006
 
 The most recent version of this document can be viewed at
 http://www.postgresql.org/docs/faqs.TODO.html.
@@ -414,6 +414,11 @@ Multi-Language Support
   http://archives.postgresql.org/pgsql-bugs/2005-10/msg00001.php
   http://archives.postgresql.org/pgsql-patches/2005-11/msg00173.php
 
+* Set client encoding based on the client operating system encoding
+
+  Currently client_encoding is set in postgresql.conf, which
+  defaults to the server encoding.
+
 
 Views / Rules
 =============
diff --git a/doc/src/FAQ/TODO.html b/doc/src/FAQ/TODO.html
index e853391e79ad541a016bc151a8f92543fb143159..480b4c8051b1e6ca5ae7138171a1f8beb7cd9610 100644
--- a/doc/src/FAQ/TODO.html
+++ b/doc/src/FAQ/TODO.html
@@ -8,7 +8,7 @@
 <body bgcolor="#FFFFFF" text="#000000" link="#FF0000" vlink="#A00000" alink="#0000FF">
 <h1><a name="section_1">PostgreSQL TODO List</a></h1>
 <p>Current maintainer:     Bruce Momjian (<a href="mailto:bruce@momjian.us">bruce@momjian.us</a>)<br/>
-Last updated:           Mon Sep 18 10:56:04 EDT 2006
+Last updated:           Mon Sep 18 11:52:19 EDT 2006
 </p>
 <p>The most recent version of this document can be viewed at<br/>
 <a href="http://www.postgresql.org/docs/faqs.TODO.html">http://www.postgresql.org/docs/faqs.TODO.html</a>.
@@ -379,6 +379,10 @@ first.
   properly in multibyte encodings
 <p>  <a href="http://archives.postgresql.org/pgsql-bugs/2005-10/msg00001.php">http://archives.postgresql.org/pgsql-bugs/2005-10/msg00001.php</a>
   <a href="http://archives.postgresql.org/pgsql-patches/2005-11/msg00173.php">http://archives.postgresql.org/pgsql-patches/2005-11/msg00173.php</a>
+</p>
+  </li><li>Set client encoding based on the client operating system encoding
+<p>  Currently client_encoding is set in postgresql.conf, which
+  defaults to the server encoding.
 </p>
 </li></ul>
 <h1><a name="section_7">Views / Rules</a></h1>