diff --git a/CREDITS b/CREDITS
index c302835..7eb2721 100644
--- a/CREDITS
+++ b/CREDITS
@@ -1,11 +1,44 @@
 Credits where credits are due:
 These people helped me with ideas, support and other things:
 
-Piotr Klaban <makler @ man.torun.pl>
-Jason Tackaberry <tack @ linux.com>
-Eivind Tagseth <eivindt @ multinet.no>
-Edward Betts <edward @ debian.org>
-Joey Hess <joey @ kitenet.net>
-Miguel Gualdron <mig @ anet.com>
-Daniel Kollar <dkollar @ fmph.uniba.sk>
-Christian Zuckschwerdt <zany @ triq.net>
+Piotr Klaban
+Jason Tackaberry
+Eivind Tagseth
+Edward Betts
+Joey Hess
+Miguel Gualdron
+Daniel Kollár
+Christian Zuckschwerdt
+Paul Oppenheim
+Emanuele Aina
+April Arcus
+Justin J. Novack
+Ben Hoskins
+Nikolay Kolev
+Juraj Bednar
+Francisco De Lozanne
+Duncan Overbruck
+delphinus
+Aditya Bhargava
+Cemil Browne
+Ruben Barkow
+Efreak
+Alexander Kuntashov
+Isaias Piña
+Andrew Wong
+Max
+Pavel Vishnyakov
+tomaszn
+Nicolas Leclercq
+Dave Wikoff
+richi235
+Ricardo J. Barberis
+Joe Block
+iamoverit
+Oxicode
+Jonas Minnberg
+alcik
+Henry Eklind
+Justin Lecher
+
+