diff --git a/doc/TODO b/doc/TODO
index 2cc80f94e4fa6ead79ccacf4723846043b2ce969..2d1995455b282486644e0d037de226eaeb1f226c 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -1,7 +1,7 @@
 PostgreSQL TODO List
 ====================
 Current maintainer:	Bruce Momjian (bruce@momjian.us)
-Last updated:		Wed Jun 11 16:54:08 EDT 2008
+Last updated:		Thu Jun 12 14:08:45 EDT 2008
 
 The most recent version of this document can be viewed at
 http://www.postgresql.org/docs/faqs.TODO.html.
@@ -689,10 +689,12 @@ SQL Commands
   http://archives.postgresql.org/pgsql-patches/2008-04/msg00203.php
 
 * Implement SQL:2003 window functions
-* Allow INSERT/UPDATE ... RETURNING inside a SELECT 'FROM' clause
+* Allow INSERT/UPDATE ... RETURNING inside a SELECT 'FROM' clause or
+  target list
 
   http://archives.postgresql.org/pgsql-general/2006-09/msg00803.php
   http://archives.postgresql.org/pgsql-hackers/2006-10/msg00693.php
+  http://archives.postgresql.org/pgsql-hackers/2008-06/msg00124.php
 
 * Increase locking when DROPing objects so dependent objects cannot
   get dropped while the DROP operation is happening
diff --git a/doc/src/FAQ/TODO.html b/doc/src/FAQ/TODO.html
index 4032ff4ab4547eeb100a8ef78f11b8c241165637..07ede637dd50e31c603a24fcb84666fe54cf8e21 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:           Wed Jun 11 16:54:08 EDT 2008
+Last updated:           Thu Jun 12 14:08:45 EDT 2008
 </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>.
@@ -603,9 +603,11 @@ first.  There is also a developer's wiki at<br/>
 <p>  <a href="http://archives.postgresql.org/pgsql-patches/2008-04/msg00203.php">http://archives.postgresql.org/pgsql-patches/2008-04/msg00203.php</a>
 </p>
   </li><li>Implement SQL:2003 window functions
-  </li><li>Allow INSERT/UPDATE ... RETURNING inside a SELECT 'FROM' clause
+  </li><li>Allow INSERT/UPDATE ... RETURNING inside a SELECT 'FROM' clause or
+  target list
 <p>  <a href="http://archives.postgresql.org/pgsql-general/2006-09/msg00803.php">http://archives.postgresql.org/pgsql-general/2006-09/msg00803.php</a>
   <a href="http://archives.postgresql.org/pgsql-hackers/2006-10/msg00693.php">http://archives.postgresql.org/pgsql-hackers/2006-10/msg00693.php</a>
+  <a href="http://archives.postgresql.org/pgsql-hackers/2008-06/msg00124.php">http://archives.postgresql.org/pgsql-hackers/2008-06/msg00124.php</a>
 </p>
   </li><li>Increase locking when DROPing objects so dependent objects cannot
   get dropped while the DROP operation is happening