--- a/cvs2cl_usermap
+++ b/cvs2cl_usermap
@@ -1,5 +1,5 @@
 flameeyes:Diego 'Flameeyes' Pettenň
-hvr:Herbert Valerio Riedel <hvr@gnu.org>
-nboullis:Nicolas Boullis <nboullis@debian.org>
-rocky:Rocky Bernstein <rocky@panix.com>
-thesin:Justin F. Hallett <thesin@southofheaven.org>
+hvr:Herbert Valerio Riedel
+nboullis:Nicolas Boullis
+rocky:Rocky Bernstein
+thesin:Justin F. Hallett