diff --git a/doc/TODO b/doc/TODO
index 134bdf5bf2..5e0eed5c04 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -1,7 +1,7 @@
PostgreSQL TODO List
====================
Current maintainer: Bruce Momjian (bruce@momjian.us)
-Last updated: Tue Jan 29 11:12:44 EST 2008
+Last updated: Thu Jan 31 10:05:01 EST 2008
The most recent version of this document can be viewed at
http://www.postgresql.org/docs/faqs.TODO.html.
@@ -1144,6 +1144,12 @@ Locking
* Add idle_in_transaction_timeout GUC so locks are not held for long
periods of time
+* Improve deadlock detection when deleting items from shared buffers
+
+ http://archives.postgresql.org/pgsql-bugs/2008-01/msg00138.php
+ http://archives.postgresql.org/pgsql-hackers/2008-01/msg00873.php
+ http://archives.postgresql.org/pgsql-committers/2008-01/msg00365.php
+
Startup Time Improvements
diff --git a/doc/src/FAQ/TODO.html b/doc/src/FAQ/TODO.html
index f23073bed9..469ef9f480 100644
--- a/doc/src/FAQ/TODO.html
+++ b/doc/src/FAQ/TODO.html
@@ -8,7 +8,7 @@
Current maintainer: Bruce Momjian (bruce@momjian.us)
-Last updated: Tue Jan 29 11:12:44 EST 2008
+Last updated: Thu Jan 31 10:05:01 EST 2008
The most recent version of this document can be viewed at
http://www.postgresql.org/docs/faqs.TODO.html.
@@ -1018,6 +1018,11 @@ first. There is also a developer's wiki at
Add idle_in_transaction_timeout GUC so locks are not held for long
periods of time
+ Improve deadlock detection when deleting items from shared buffers
+ http://archives.postgresql.org/pgsql-bugs/2008-01/msg00138.php
+ http://archives.postgresql.org/pgsql-hackers/2008-01/msg00873.php
+ http://archives.postgresql.org/pgsql-committers/2008-01/msg00365.php
+