diff --git a/.mailmap b/.mailmap
index b2c6703..247cdb9 100644
--- a/.mailmap
+++ b/.mailmap
@@ -5,4 +5,7 @@ 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>
+Ricardo Cropalato de Melo <ricardo@cropalato.com.br> Ricardo Melo <ricardo.melo@gameloft.com>
 Olivier Fontannaud <albustax@gmail.com> ofontannaud <ofontannaud@etai.fr>
+Olivier Fontannaud <albustax@gmail.com> Olivier FONTANNAUD <albustax@gmail.com>
+Matthew J. Brooks <matthew@sonomatechpartners.com> Matthew Brooks <matthew@sonomatechpartners.com>
diff --git a/AUTHORS b/AUTHORS
index 61d5c55..1460575 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -6,16 +6,13 @@ 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>
 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>
 Steven Bambling <smbambling@gmail.com>
 Thomas Weißschuh <thomas@t-8ch.de>
 Tom De Vylder <tom@penumbra.be>