diff --git a/doc/TODO b/doc/TODO
index 3d161af4477..6433e9d6308 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -303,24 +303,22 @@ Developers who have claimed items are:
 	* Billy is Billy G. Allie <Bill.Allie@mug.org>
 	* Brook is Brook Milligan <brook@trillium.NMSU.Edu>
 	* Bruce is Bruce Momjian<pgman@candle.pha.pa.us>
-	* Bryan is Bryan Henderson<bryanh@giraffe.netgate.net>
 	* D'Arcy is D'Arcy J.M. Cain <darcy@druid.net>
-	* David is David Hartwig <daveh@insightdist.com>
 	* Edmund is Edmund Mergl <E.Mergl@bawue.de>
 	* Goran is Goran Thyni <goran@kyla.kiruna.se>
-	* Hiroshi is Hiroshi Inoue<Inoue@tpf.co.jp>
+	* Hiroshi is Hiroshi Inoue <Inoue@tpf.co.jp>
+	* Karel is Karel Zak <zakkr@zf.jcu.cz>
 	* Jan is Jan Wieck <wieck@sapserv.debis.de>
  	* Marc is Marc Fournier <scrappy@hub.org>
-	* Massimo Dal Zotto <dz@cs.unitn.it>
+	* Massimo is Massimo Dal Zotto <dz@cs.unitn.it>
 	* Michael is Michael Meskes <meskes@postgresql.org>
 	* Oleg is Oleg Bartunov <oleg@sai.msu.su>
 	* Peter is Peter T Mount <peter@retep.org.uk>
-	* Philip Warner <pjw@rhyme.com.au>
+	* Philip is Philip Warner <pjw@rhyme.com.au>
 	* Peter E is Peter Eisentraut<peter_e@gmx.net>
 	* Ryan is Ryan Bradetich <rbrad@hpb50023.boi.hp.com>
-	* Stefan Simkovics <ssimkovi@rainbow.studorg.tuwien.ac.at>
 	* Tatsuo is Tatsuo Ishii <t-ishii@sra.co.jp>
 	* Tom is Tom Lane <tgl@sss.pgh.pa.us>
 	* Thomas is Thomas Lockhart <lockhart@alumni.caltech.edu>
 	* TomH is Tom I Helbekkmo <tih@Hamartun.Priv.NO>
-	* Vadim is "Vadim B. Mikheev" <vadim4o@email.com>  
+	* Vadim is Vadim B. Mikheev <vadim4o@email.com>