diff --git a/doc/TODO b/doc/TODO
index 4d2bdc25c00f8bf528065104ebdc3ee2d4cf5859..b5e37bb954165cf8b43971790e4ad61a4a9ff939 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -2,7 +2,7 @@
PostgreSQL TODO List
====================
Current maintainer: Bruce Momjian (bruce@momjian.us)
-Last updated: Mon Feb 19 12:58:25 EST 2007
+Last updated: Mon Feb 19 15:06:50 EST 2007
The most recent version of this document can be viewed at
http://www.postgresql.org/docs/faqs.TODO.html.
@@ -543,6 +543,11 @@ SQL Commands
* Implement SQL:2003 window functions
* Improve failure message when DROP DATABASE is used on a database that
has prepared transactions
+* Allow INSERT/UPDATE ... RETURNING inside a SELECT 'FROM' clause
+
+ http://archives.postgresql.org/pgsql-general/2006-09/msg00803.php
+ http://archives.postgresql.org/pgsql-hackers/2006-10/msg00693.php
+
* CREATE
diff --git a/doc/src/FAQ/TODO.html b/doc/src/FAQ/TODO.html
index 0e280915284a553dedd9651c780f9b850ad5f6a8..650902998c9f8cad47e7bd7aee9bf17e33d07e52 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 Feb 19 12:58:25 EST 2007
+Last updated: Mon Feb 19 15:06:50 EST 2007
</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>.
@@ -490,6 +490,10 @@ first. There is also a developer's wiki at<br/>
</li><li>Implement SQL:2003 window functions
</li><li>Improve failure message when DROP DATABASE is used on a database that
has prepared transactions
+ </li><li>Allow INSERT/UPDATE ... RETURNING inside a SELECT 'FROM' clause
+<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>
+</p>
</li><li>CREATE
<ul>
<li>Allow CREATE TABLE AS to determine column lengths for complex