diff --git a/AUTHORS.txt b/AUTHORS.txt
index c2c97b47..9724cae3 100644
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -1,20 +1,23 @@
 Main Authors
 ============
 
-David Halter (@davidhalter)
-Takafumi Arakaki (@tkf)
+David Halter (@davidhalter) <davidhalter88@gmail.com>
+Takafumi Arakaki (@tkf) <aka.tkf@gmail.com>
 
 Code Contributors
 =================
 
-Danilo Bargen (@dbrgn)
-Laurens Van Houtven (@lvh)
-Aldo Stracquadanio (@Astrac)
-Jean-Louis Fuchs (@ganwell)
+Danilo Bargen (@dbrgn) <gezuru@gmail.com>
+Laurens Van Houtven (@lvh) <_@lvh.cc>
+Aldo Stracquadanio (@Astrac) <aldo.strac@gmail.com>
+Jean-Louis Fuchs (@ganwell) <ganwell@fangorn.ch>
 tek (@tek)
-Yasha Borevich (@jjay)
+Yasha Borevich (@jjay) <j.borevich@gmail.com>
 Aaron Griffin <aaronmgriffin@gmail.com>
 andviro (@andviro)
-Mike Gilbert (@floppym)
-Aaron Meurer (@asmeurer)
+Mike Gilbert (@floppym) <floppym@gentoo.org>
+Aaron Meurer (@asmeurer) <asmeurer@gmail.com>
 Lubos Trilety <ltrilety@redhat.com>
+
+
+Note: (@user) means a github user name.