diff --git a/MAINTAINERS.txt b/MAINTAINERS.txt
index 9c09f88..7cfdce9 100644
--- a/MAINTAINERS.txt
+++ b/MAINTAINERS.txt
@@ -17,69 +17,69 @@ LEGEND
 --------------------------------------------------------------------------------
 
 BLOG API
-M: James Walker <walkah@walkah.net>
+M: James Walker walkah@walkah.net
 S: maintained
 
 DISTRIBUTED AUTHENTICATION MODULES
-M: Moshe Weitzman <weitzman@tejasa.com>
+M: Moshe Weitzman weitzman@tejasa.com
 S: maintained
 
 DOCUMENTATION COORDINATOR
-M: Steven Peck <speck@blkmtn.org>
+M: Steven Peck speck@blkmtn.org
 S: maintained
 
 FILTER SYSTEM
-M: Steven Wittens <unconed@drupal.org>
+M: Steven Wittens unconed@drupal.org
 S: maintained
 
 FORM SYSTEM
-M: Károly Négyesi <chx@mail.tvnet.hu>
+M: Károly Négyesi chx@mail.tvnet.hu
 S: maintained
 
 LOCALE MODULE
-M: Gabor Hojtsy <goba@php.net>
+M: Gabor Hojtsy goba@php.net
 S: maintained
 
 LOGGING
-M: Khalid Baheyeldin <drupal@2bits.com>
+M: Khalid Baheyeldin drupal@2bits.com
 S: maintained
 
 MENU SYSTEM
-M: Károly Négyesi <chx@mail.tvnet.hu>
+M: Károly Négyesi chx@mail.tvnet.hu
 S: maintained
 
 PATH MODULE
-M: Matt Westgate <drupal@asitis.org>
+M: Matt Westgate drupal@asitis.org
 S: maintained
 
 POSTGRESQL
-M: Sammy Spets <sammys-drupal@synerger.com>
+M: Sammy Spets sammys-drupal@synerger.com
 S: maintained
 
 SECURITY COORDINATOR
-M: Heine Deelstra <hdeelstra@gmail.com>
+M: Heine Deelstra hdeelstra@gmail.com
 S: maintained
 
 STATISTICS MODULE
-M: Jeremy Andrews <jeremy@kerneltrap.com>
+M: Jeremy Andrews jeremy@kerneltrap.com
 S: maintained
 
 THEME SYSTEM
-M: Earl Miles <merlin@logrus.com>
-   Joon Park <joon@dvessel.com>
+M: Earl Miles merlin@logrus.com
+   Joon Park joon@dvessel.com
 S: maintained
 
 UPDATE MODULE
-M: Derek Wright <http://drupal.org/user/46549/contact>
+M: Derek Wright http://drupal.org/user/46549/contact
 S: maintained
 
 XML-RPC SERVER/CLIENT
-M: John VanDyk <http://drupal.org/user/2375/contact>
+M: John VanDyk http://drupal.org/user/2375/contact
 S: maintained
 
 TRANSLATIONS COORDINATOR
-M: Gerhard Killesreiter <gerhard@killesreiter.de>
+M: Gerhard Killesreiter gerhard@killesreiter.de
 S: maintained
 
 THE REST:
-M: Dries <dries@drupal.org>
+M: Dries dries@drupal.org
