diff --git a/.mailmap b/.mailmap
index accc9621a..9af6eb6af 100644
--- a/.mailmap
+++ b/.mailmap
@@ -9,3 +9,4 @@ Isaac Z. Schlueter <i@izs.me>
 Saúl Ibarra Corretgé <saghul@gmail.com>
 Yuki OKUMURA <mjt@cltn.org>
 Frank Denis <github@pureftpd.org>
+Ryan Emery <seebees@gmail.com>
diff --git a/AUTHORS b/AUTHORS
index 16f88934f..40286bcf8 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -33,3 +33,6 @@ Roman Shtylman <shtylman@gmail.com>
 Frank Denis <github@pureftpd.org>
 Carter Allen <CarterA@opt-6.com>
 Tj Holowaychuk <tj@vision-media.ca>
+Shimon Doodkin <helpmepro1@gmail.com>
+Ryan Emery <seebees@gmail.com>
+Bruce Mitchener <bruce.mitchener@gmail.com>