diff --git a/.mailmap b/.mailmap
index 2cb069d..b2c6703 100644
--- a/.mailmap
+++ b/.mailmap
@@ -3,3 +3,6 @@
 <michael.friedrich@netways.de> <Michael.Friedrich@netways.de>
 Nick Chappell <nick@intronic.org> nickchappell <nick@intronic.org>
 Mélanie Gault <melanie.gault@ville-noumea.nc> melanie <melanie.gault@ville-noumea.nc>
+Mélanie Gault <melanie.gault@ville-noumea.nc> Melanie Gault <melanie.gault@ville-noumea.nc>
+Ricardo Cropalato de Melo <ricardo@cropalato.com.br> ricardo@cropalato.com.br <ricardo@cropalato.com.br>
+Olivier Fontannaud <albustax@gmail.com> ofontannaud <ofontannaud@etai.fr>
diff --git a/AUTHORS b/AUTHORS
index 9741758..61d5c55 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,11 +1,21 @@
+Achim Ledermüller <achim.ledermueller@netways.de>
 Adam Stephens <adam.c.stephens@noaa.gov>
+Alessandro Franceschi <al@lab42.it>
+Alexandre Beche <alexandre.beche@gmail.com>
+Devon Mizelle <devon@arin.net>
 Gunnar Beutner <gunnar.beutner@netways.de>
+Josh Holland <josh@inv.alid.pw>
+Markus Frosch <markus@lazyfrosch.de>
+Matthew Brooks <matthew@sonomatechpartners.com>
+Matthew J. Brooks <matthew@sonomatechpartners.com>
 Mélanie Gault <melanie.gault@ville-noumea.nc>
 Michael Friedrich <michael.friedrich@netways.de>
 Nick Chappell <nick@intronic.org>
-Thomas Weißschuh <thomas@t-8ch.de>
-Steven Bambling <smbambling@gmail.com>
-Josh Holland <josh@inv.alid.pw>
+Nicolas Bigler <bigli@bigli.ch>
+Olivier Fontannaud <albustax@gmail.com>
+Olivier FONTANNAUD <albustax@gmail.com>
+Ricardo Cropalato de Melo <ricardo@cropalato.com.br>
 Ricardo Melo <ricardo.melo@gameloft.com>
-Tom De Vylder
-Devon Mizelle <devon@arin.net>
\ No newline at end of file
+Steven Bambling <smbambling@gmail.com>
+Thomas Weißschuh <thomas@t-8ch.de>
+Tom De Vylder <tom@penumbra.be>