diff --git a/doc/TODO b/doc/TODO
index 94ca2f49af7ecdf0673650ed0e15d3d153bb3ca3..7ff3e9ff002c2bf3a9fcf348a3b50d17bcb9d684 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -2,7 +2,7 @@
 PostgreSQL TODO List
 ====================
 Current maintainer:	Bruce Momjian (bruce@momjian.us)
-Last updated:		Thu Jul 27 18:05:37 EDT 2006
+Last updated:		Fri Jul 28 08:23:58 EDT 2006
 
 The most recent version of this document can be viewed at
 http://www.postgresql.org/docs/faqs.TODO.html.
@@ -1447,6 +1447,6 @@ Developers who have claimed items are:
 * Rod is Rod Taylor <pg@rbt.ca>
 * Simon is Simon Riggs <simon@2ndquadrant.com>
 * Stephan is Stephan Szabo <sszabo@megazone23.bigpanda.com>
-* Tatsuo is Tatsuo Ishii <t-ishii@sra.co.jp> of Software Research Assoc.
+* Tatsuo is Tatsuo Ishii <ishii@sraoss.co.jp> of SRA OSS, Inc. Japan
 * Teodor is Teodor Sigaev <teodor@sigaev.ru>
 * Tom is Tom Lane <tgl@sss.pgh.pa.us> of Red Hat
diff --git a/doc/src/FAQ/TODO.html b/doc/src/FAQ/TODO.html
index 20b969c5b446b97fb0487932e5e0f06a43c0b078..6b963a85653c5bbfe4844702eacb3be12d77fe0a 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:           Thu Jul 27 18:05:37 EDT 2006
+Last updated:           Fri Jul 28 08:23:58 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>.
@@ -1307,7 +1307,7 @@ first.
   </li><li>Rod is Rod Taylor &lt;<a href="mailto:pg@rbt.ca">pg@rbt.ca</a>&gt;
   </li><li>Simon is Simon Riggs &lt;<a href="mailto:simon@2ndquadrant.com">simon@2ndquadrant.com</a>&gt;
   </li><li>Stephan is Stephan Szabo &lt;<a href="mailto:sszabo@megazone23.bigpanda.com">sszabo@megazone23.bigpanda.com</a>&gt;
-  </li><li>Tatsuo is Tatsuo Ishii &lt;<a href="mailto:t-ishii@sra.co.jp">t-ishii@sra.co.jp</a>&gt; of Software Research Assoc.
+  </li><li>Tatsuo is Tatsuo Ishii &lt;<a href="mailto:ishii@sraoss.co.jp">ishii@sraoss.co.jp</a>&gt; of SRA OSS, Inc. Japan
   </li><li>Teodor is Teodor Sigaev &lt;<a href="mailto:teodor@sigaev.ru">teodor@sigaev.ru</a>&gt;
   </li><li>Tom is Tom Lane &lt;<a href="mailto:tgl@sss.pgh.pa.us">tgl@sss.pgh.pa.us</a>&gt; of Red Hat
 </li></ul>