diff --git a/.mailmap b/.mailmap
index f4f630f1b1..c1107f7a50 100644
--- a/.mailmap
+++ b/.mailmap
@@ -2,6 +2,7 @@ Adrian Cole <acole@.eng.vmware.com>
 Adrian Cole <adrian.f.cole@3d8758e0-26b5-11de-8745-db77d3ebf521>
 Adrian Cole <adrian.f.cole@gmail.com>
 Adrian Cole <ferncam1@3d8758e0-26b5-11de-8745-db77d3ebf521>
+Alex Yarmula <oleksiy.yarmula+hosting@gmail.com>
 Alfredo Morresi <rainbowbreeze@gmx.com>
 Alfredo Morresi <rainbowbreeze@pc-alfredo.(none)>
 Andrea Turli <andrea@bigmac.local>
@@ -12,8 +13,16 @@ Andrea Turli <toor@toor.(none)>
 Andrei Savu <asavu@apache.org>
 Andrew Phillips <sharedocs1@gmail.com@3d8758e0-26b5-11de-8745-db77d3ebf521>
 Antoni Batchelli <tbatchelli@acm.org>
+Carlos Sanchez <carlos@apache.org>
 Dan Lo Bianco <dan.lobianco@cloudsoftcorp.com>
+Dmitry Durnev <ddurnev@griddynamics.com>
+Hans Hrasna <hans.hrasna@gmail.com>
+Hunter Hutchinson <hunter.hutchinson@gmail.com>
 Ivan Meredith <ivan@ivan.net.nz@3d8758e0-26b5-11de-8745-db77d3ebf521>
+James Murty <jamurty@3d8758e0-26b5-11de-8745-db77d3ebf521>
+Nicholas Terry <nterry@familysearch.org>
 Seshu Pasam <github@pasam.com>
+Shane Witbeck <shane@digitalsanctum.com>
 Tibor Kiss <tibor.kiss@omixon.com>
 Vijay Kiran <mail@vijaykiran.com>
+Zack Shoylev <zack.shoylev@rackspace.com>