diff --git a/AUTHORS b/AUTHORS
index 5afee785..86974af5 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,25 +1,52 @@
-Current maintainer
-------------------
+Maintainers
+-----------
 Fatih Aşıcı <fatih [at] pardus.org.tr>
 
-Authors and contributors
-------------------------
-
+Developers
+----------
 A. Murat Eren <meren [at] pardus.org.tr>
-Ahmet Aygun <ahmet [at] pardusman.org>
 Bahadır Kandemir <bahadir [at] pardus.org.tr>
 Barış Metin <baris [at] pardus.org.tr>
+Eray Özkural <erayo [at] cs.bilkent.edu.tr>
 Faik Uygur <faik [at] pardus.org.tr>
 Fatih Aşıcı <fatih [at] pardus.org.tr>
-Furkan Duman <coderlord [at] gmail.com>
-Gökmen Görgen <gkmngrgn [at] gmail.com>
 Gürer Özen <gurer [at] pardus.org.tr>
 İsmail Dönmez <ismail [at] pardus.org.tr>
+Mehmet D. Akın <mdakin [at] pardus.org.tr>
 Onur Küçük <onur [at] pardus.org.tr>
 Ozan Çağlayan <ozan [at] pardus.org.tr>
 S. Çağlar Onur <caglar [at] pardus.org.tr>
 Serdar Dalgıç <serdar [at] pardus.org.tr>
 
-Inactive contributors
----------------------------------
-Eray Özkural < erayo@cs.bilkent.edu.tr >
+Contributors
+------------
+Ahmet Aygun <ahmet [at] pardusman.org>
+Ali Erdinç Köroğlu <erdinc [at] pardus.org.tr>
+Amine Chadly <amine.chadly [at] gmail.com>
+Andre van der Lubben <klikspin [at] gmail.com>
+Andrea Decorte <adecorte [at] gmail.com>
+Anton Tolboom <atolboo [at] gmail.com>
+Beyza Ermiş <b_ermis [at] ug.bilkent.edu.tr>
+Christian Faure <christian.faurebouvard [at] laposte.net>
+Davide Siciliano <edivad95 [at] gmail.com>
+Eren Türkay <eren [at] pardus.org.tr>
+Furkan Duman <coderlord [at] gmail.com>
+Gökhan Göktürk <ggokturk [at] sabanciuniv.edu>
+Gökmen Göksel <gokmen [at] pardus.org.tr>
+Gökmen Görgen <gkmngrgn [at] gmail.com>
+Gökçen Eraslan <gokcen [at] pardus.org.tr>
+Görkem Çetin <gorkem [at] pardus.org.tr>
+H. İbrahim Güngör <h.ibrahim.gungor [at] gmail.com>
+Klemens Häckel <click3d [at] linuxmail.org>
+Mustafa Ölçerman <oelcerman [at] fussballkreis.org>
+Necmettin Begiter <necmettin.begiter [at] gmail.com>
+Patrik Karlsson <patrik [at] pardus.nu>
+Pedro Leite <pedro.leite [at] gmail.com>
+Philippe Svetoslavsky <philsvet [at] gmail.com>
+Piotr Maliński <riklaunim [at] gmail.com>
+Pınar Yanardağ <pinar [at] pardus.org.tr>
+Rinse de Vries <rinsedevries [at] kde.nl>
+Semen Cirit <scirit [at] pardus.org.tr>
+Stefan Wilhelm <sw1976de [at] googlemail.com>
+Uğur Çetin <ugur.jnmbk [at] gmail.com>
+Willem Gielen <w.gielen [at] gmail.com>