diff --git a/.mailmap b/.mailmap
index de9a9bc61ec..38e5c1928a7 100644
--- a/.mailmap
+++ b/.mailmap
@@ -52,6 +52,7 @@ Igor Zinkovsky <igorzi@microsoft.com>
 Isaac Z. Schlueter <i@izs.me>
 Isaac Z. Schlueter <i@izs.me> <i@foohack.com>
 Jake Verbaten <raynos2@gmail.com>
+James Hartig <fastest963@gmail.com> <james.hartig@grooveshark.com>
 Jered Schmidt <tr@nslator.jp>
 Jeremiah Senkpiel <fishrock123@rocketmail.com>
 Joe Shaw <joe@joeshaw.org> <joeshaw@litl.com>
diff --git a/AUTHORS b/AUTHORS
index 29956111569..2b2fe64309b 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -260,7 +260,7 @@ Adam Malcontenti-Wilson <adman.com@gmail.com>
 Avi Flax <avi@aviflax.com>
 Pedro Teixeira <pedro.teixeira@gmail.com>
 Johan Bergström <bugs@bergstroem.nu>
-James Hartig <james.hartig@grooveshark.com>
+James Hartig <fastest963@gmail.com>
 Shannen Saez <shannenlaptop@gmail.com>
 Seong-Rak Choi <ragiragi@hanmail.net>
 Dave Irvine <davman99@gmail.com>
@@ -764,5 +764,14 @@ Frederic Hemberger <mail@frederic-hemberger.de>
 Sharat M R <cosmosgenius@gmail.com>
 Rich Trott <rtrott@gmail.com>
 Felipe Batista <fsbatista1@gmail.com>
+Rebecca Turner <me@re-becca.org>
+Tyler Anton <mtyleranton@gmail.com>
+João Reis <reis@janeasystems.com>
+Kat Marchán <kzm@sykosomatic.org>
+Ryan Petschek <petschekr@gmail.com>
+Pierre Inglebert <pierre.inglebert@gmail.com>
+Ivan Yan <yan.2314@gmail.com>
+Sangmin Yoon <sangmin.yoon@croquis.com>
+Mark Plomer <mark.plomer@boerse-go.de>
 
 # Generated by tools/update-authors.sh