diff --git a/AUTHORS b/AUTHORS
index 05530e3..c9eb287 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,12 +1,26 @@
+# Developers
+
+Cédric Bonhomme
+Jérôme Lombardi
+Juan Rocha
+
+
+# Contributors
+
 Alexandre Dulaunoy
-Benjamin Ganivet
 Cédric Bonhomme
 Cyril Rouyer
 Guillaume Lesniak
-Jerome De Almeida
-Jerome Lombardi
+Jérôme De Almeida
+Jérôme Lombardi
 Juan Rocha
-Majdi SFAXI
-Pascal Paulis
 Thomas Metois
-Yacine Khamis
+
+
+# Copyright holders
+
+Copyright (C) 2016-2018 Juan Rocha - https://github.com/jfrocha
+Copyright (C) 2016-2018 Jérôme Lombardi - https://github.com/jerolomb
+Copyright (C) 2016-2018 SMILE gie securitymadein.lu
+Copyright (C) 2017-2018 Cédric Bonhomme - https://github.com/cedricbonhomme
+
diff --git a/README.md b/README.md
index 3d33b2d..e4d23f5 100644
--- a/README.md
+++ b/README.md
@@ -77,4 +77,9 @@ License
 This software is licensed under
 [GNU Affero General Public License version 3](http://www.gnu.org/licenses/agpl-3.0.html)
 
-Copyright (C) 2016-2017 SMILE gie securitymadein.lu
+Copyright (C) 2016-2018 Juan Rocha - https://github.com/jfrocha
+Copyright (C) 2016-2018 Jérôme Lombardi - https://github.com/jerolomb
+Copyright (C) 2016-2018 SMILE gie securitymadein.lu
+Copyright (C) 2017-2018 Cédric Bonhomme - https://github.com/cedricbonhomme
+
+For more information, [the list of authors and contributors](AUTHORS) is available.