diff --git a/.mailmap b/.mailmap
index c25ea86..c73c0f9 100644
--- a/.mailmap
+++ b/.mailmap
@@ -2,3 +2,4 @@
 #   git log --all --reverse --format='%aN <%aE>' | perl -ne 'BEGIN{print "# Authors ordered by first contribution.\n"} print unless $h{$_}; $h{$_} = 1' > AUTHORS
 Ryan Dahl <ry@tinyclouds.org>
 Salman Haq <salman.haq@asti-usa.com>
+Simon Zimmermann <simonz05@gmail.com>
diff --git a/AUTHORS b/AUTHORS
index abe99de..c0d2fe4 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -30,3 +30,8 @@ James McLaughlin <jamie@lacewing-project.org>
 David Gwynne <loki@animata.net>
 LE ROUX Thomas <thomas@procheo.fr>
 Randy Rizun <rrizun@ortivawireless.com>
+Andre Louis Caron <andre.louis.caron@usherbrooke.ca>
+Simon Zimmermann <simonz05@gmail.com>
+Erik Dubbelboer <erik@dubbelboer.com>
+Martell Malone <martellmalone@gmail.com>
+Bertrand Paquet <bpaquet@octo.com>