diff --git a/AUTHORS b/AUTHORS
index 3fd653bc5..605d70f28 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,24 +1,94 @@
-Mike Kestner  <mkestner@ximian.com>
+Maintainers:
+	Mike Kestner
 
-Documentation:
-
-	psonek2@seznam.cz
+Contributors:
+	Aaron Bockover
+	Age Bosma
+	Alejandro Sánchez Acosta
+	Alex Launi
+	Alexandre Gomes
+	Alp Toker
+	Andrés G. Aragoneses
+	Atsushi Eno
+	Ben Maurer
+	Ben Motmans
+	Bertrand Lorentz
+	Bob Smith
+	Brad Taylor
+	Cameron White
+	Carlos Martín Nieto
+	Charles Iliya Krempeaux
+	Chris Turchin
+	Christian Hergert
+	Christian Hoff
+	Dan Winship
+	Daniel Kornhauser Eisenberg
+	Daniel Morgan
 	Duncan Mak
+	Eric Butler
+	Erik Dasque
+	Ettore Perazzoli
+	Fawad Halim
+	Gabriel Burt
+	Gonzalo Paniagua Javier
+	Hector E. Gomez Morales
+	Iain McCoy
+	Jaime Anguiano Olarra
+	Jamin Philip Gray
+	Jasper van Putten
+	Jeffrey Stedfast
+	Jeroen Zwartepoorte
+	Joe Shaw
+	Johannes Roith
+	John Luke
+	Jordi Mas i Hernandez
+	Joshua Tauberer
+	Juli Mallett
+	Kevin Breit
+	Kristian Rietveld
+	Larry Ewing
+	Lee Mallabone
+	Lluis Sanchez
+	Marek Habersack
+	Mark Crichton
+	Mark Probst
+	Marques Johansson
+	Martin Baulig
+	Martin Willemoes Hansen
+	Michael Hutchinson
 	Miguel de Icaza
-	John Luke <john.luke@gmail.com>
-	Marques Johansson <marques@displague.com>
-	Iain McCoy <iain@mccoy.id.au>
-	eric@extremeboredom.net (Eric Butler)
-	Jamin Philip Gray <jamin@pubcrawler.org>
-	chris@turchin.net (Chris Turchin)
-	jaspervp@gmx.net (Jasper van Putten)
-	wizito@gentelibre.org ( Néstor Salceda)
-	cmorgan@alum.wpi.edu
-	hris@protactin.co.uk
-	ddollar@blueshiftdesign.com
+	Mike Gorse
+	Mike Kestner
+	Mirco Bauer
+	Néstor Salceda
+	Olivier Dufour
+	Owen Fraser-Green
+	Paolo Molaro
+	Pedro Martínez Juliá
+	Pete Johanson
+	Peter Williams
+	Rachel Hestilow
+	Radek Doulik
+	Raja R Harinath
+	Ricardo Fernández Pascual
+	Robert McQueen
+	Rodrigo Moya
+	Shane Landrum
+	Stephane Delcroix
+	Tambet Ingo
+	Todd Berman
+	Urs C. Muff
+	Vladimir Vukicevic
+	Wade Berrier
+	Zac Bowling
+	Zoltan Varga
 	bis0n@mail.ru
+	cmorgan@alum.wpi.edu
+	ddollar@blueshiftdesign.com
 	fsjrb@uaf.edu
+	hris@protactin.co.uk
 	joe@fatnsoft.com
+	petr
 	pixelpapst@users.sourceforge.net
-	alexmipego@hotmail.com
-	wizito@gentelibre.org
+	psonek2@seznam.cz
+	
\ No newline at end of file