diff --git a/.mailmap b/.mailmap
index 718d8f4b..0682f673 100644
--- a/.mailmap
+++ b/.mailmap
@@ -24,4 +24,6 @@ Christopher Schirner <christopher@hackerspace-bamberg.de> <schinken@hackerspace-
 Laura Barber <laura.c.barber@gmail.com> <artzii.laura@gmail.com>
 John Cass <john.cass77@gmail.com>
 Ronald Zielaznicki <zielaznickizm@g.cofc.edu> <zielaznickiz@g.cofc.edu>
+Kyle Heyne <kyleheyne@gmail.com>
 Tom Roth <rawdlite@googlemail.com>
+Eric Jahn <ejahn@newstore.com>
diff --git a/AUTHORS b/AUTHORS
index 258967c3..c2baca6c 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -57,5 +57,8 @@
 - Camilo Nova <camilo.nova@gmail.com>
 - Dražen Lučanin <kermit666@gmail.com>
 - Naglis Jonaitis <njonaitis@gmail.com>
+- Kyle Heyne <kyleheyne@gmail.com>
 - Tom Roth <rawdlite@googlemail.com>
 - Mark Greenwood <fatgerman@gmail.com>
+- Stein Karlsen <karlsen.stein@gmail.com>
+- Eric Jahn <ejahn@newstore.com>