diff --git a/doc/TODO b/doc/TODO
index bd5bd7d612ee6dbea6e5640da22be696afa44644..949312196d76b9d21083490aaa34200d807d2cb9 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -2,7 +2,7 @@
 PostgreSQL TODO List
 ====================
 Current maintainer:	Bruce Momjian (bruce@momjian.us)
-Last updated:		Fri Feb 16 17:19:57 EST 2007
+Last updated:		Fri Feb 16 20:35:38 EST 2007
 
 The most recent version of this document can be viewed at
 http://www.postgresql.org/docs/faqs.TODO.html.
@@ -736,6 +736,12 @@ SQL Commands
 
 		  http://archives.postgresql.org/pgsql-patches/2006-02/msg00165.php
 
+		o Allow row and record variables to be set to NULL constants,
+		  and allow NULL tests on such variables
+
+		  Because a row is not scalar, do not allow assignment
+		  from NULL-valued scalars.
+
 	o Other
 		o Add table function support to pltcl, plpython
 		o Add support for polymorphic arguments and return types to
diff --git a/doc/src/FAQ/TODO.html b/doc/src/FAQ/TODO.html
index f5c12701b527ff50694fb9a25b608b9b7f5ebce8..8aa3da6b213ff5822a4e4931d5d020d1dba2c2a3 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:           Fri Feb 16 17:19:57 EST 2007
+Last updated:           Fri Feb 16 20:35:38 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>.
@@ -658,6 +658,11 @@ first.  There is also a developer's wiki at<br/>
       </li><li>Fix problems with RETURN NEXT on tables with
                   dropped/added columns after function creation
 <p>                  <a href="http://archives.postgresql.org/pgsql-patches/2006-02/msg00165.php">http://archives.postgresql.org/pgsql-patches/2006-02/msg00165.php</a>
+</p>
+      </li><li>Allow row and record variables to be set to NULL constants,
+                  and allow NULL tests on such variables
+<p>                  Because a row is not scalar, do not allow assignment
+                  from NULL-valued scalars.
 </p>
     </li></ul>
     </li><li>Other