diff --git a/doc/devel/todo b/doc/devel/todo
index 26a1c8fd7017165ad4870a7298f8fc934dadb88f..fea0c957f16d6d71cfcdfb060c4c5fdd25bc1495 100644
--- a/doc/devel/todo
+++ b/doc/devel/todo
@@ -40,9 +40,11 @@ Modify -lldap to be reentrant/threadsafe <bart@openldap.org>
 Modify -llthread to hide thread implementation <bart@openldap.org>
 Modify libraries to use application specified logging routines
 Modify libraries to use application specified memory allocation routines
+Modify servers to use reentrant library functions
 Extend configure.in to support autodetect of ISODE features.
-Port slurpd to NT
+Remove ldapconfig.h.edit dependencies.
 Update SLAPD/SLURD Admin Guide
+Port slurpd to NT
 
 
 Small projects
@@ -50,8 +52,10 @@ Small projects
 Modify servers to use reentrant library functions
 Extend ldap clients to have -P(rotocol) version flag (2 or 3)
 Create ldapurl (from ldapsearch?) to support searching by URL
+Create ldapquery (from ldapsearch?) to support searching using ldap_getfilter(3)
+Extend ldap clients to have -P(rotocol) version flag (2 or 3)
 Extend configure.in to support autodetect of Kerberos features.
-Extend mail500 (and other daemons) to use ldap filters.
-Update libldbm to support DB 2.4 
-Update any manual page
+Extend mail500 (and other daemons) to use ldap_getfilter(3)
+Update libldbm to support Sleepcat's Berkeley DB 2.4 
 Add useful information to our FAQ http://www.openldap.org/faq/
+Update any manual page