diff --git a/.mailmap b/.mailmap
index 4a2ea9cc958..4597ae9e47f 100644
--- a/.mailmap
+++ b/.mailmap
@@ -53,6 +53,7 @@ Benjamin Coe <bencoe@gmail.com> <bencoe@google.com>
 Benjamin Fleischer <github@benjaminfleischer.com> Benjamin Fleischer <benjamin.fleischer@swipesense.com>
 Benjamin Gruenbaum <benjamingr@gmail.com> <benji@peer5.com>
 Benjamin Gruenbaum <benjamingr@gmail.com> <inglor@gmail.com>
+Benjamin Gruenbaum <benjamingr@gmail.com> <benjamingruenbaum@Benjamins-MacBook-Pro.local>
 Benjamin Waters <benjamin.waters@outlook.com> <ben25890@gmail.com>
 Bert Belder <bertbelder@gmail.com> <bert@piscisaureus2.(none)>
 Bert Belder <bertbelder@gmail.com> <info@2bs.nl>
@@ -283,8 +284,9 @@ Minwoo Jung <nodecorelab@gmail.com> <jmwsoft@gmail.com>
 Minwoo Jung <nodecorelab@gmail.com> <minwoo@nodesource.com>
 Miroslav Bajtoš <miroslav@strongloop.com> <miro.bajtos@gmail.com>
 Mitar Milutinovic <mitar.git@tnode.com>
-Myles Borins <myles.borins@gmail.com> <mborins@us.ibm.com>
-Myles Borins <myles.borins@gmail.com> <mylesborins@google.com>
+Myles Borins <mylesborins@github.com> <mborins@us.ibm.com>
+Myles Borins <mylesborins@github.com> <mylesborins@google.com>
+Myles Borins <mylesborins@github.com> <myles.borins@gmail.com>
 Nam Nguyen <nam.nguyen@de.ibm.com>
 Nebu Pookins <nebu@nebupookins.net>
 Netto Farah <nettofarah@gmail.com> nettofarah <nettofarah@gmail.com>
@@ -326,6 +328,7 @@ Roman Reiss <me@silverwind.io>
 Ron Korving <ron@ronkorving.nl> <rkorving@wizcorp.jp>
 Ron Korving <ron@ronkorving.nl> ronkorving <ron@ronkorving.nl>
 Ruben Bridgewater <ruben@bridgewater.de> <ruben.bridgewater@fintura.de>
+Ruben Bridgewater <ruben@bridgewater.de> <ruben.bridgewater@maibornwolff.de>
 Russell Dempsey <sgtpooki@gmail.com> <SgtPooki@gmail.com>
 Ryan Dahl <ry@tinyclouds.org>
 Ryan Emery <seebees@gmail.com>
@@ -407,6 +410,8 @@ Tim Smart <timehandgod@gmail.com> <tim@fostle.com>
 Tim Smart <timehandgod@gmail.com> <timehandgod@gmail.com>
 Timothy Leverett <zzzzBov@gmail.com> Timothy <zzzzBov@gmail.com>
 Tobias Nießen <tniessen@tnie.de> <tniessen@users.noreply.github.com>
+Tom Atkinson <atkinson.tommy@nsoft.com> <atkinson.tommy@nhome.ba>
+Tom Atkinson <atkinson.tommy@nsoft.com> <atkinson.tommy@nsoft.ba>
 Tom Hughes <tom.hughes@palm.com> <tomtheengineer@gmail.com>
 Tom Hughes-Croucher <tom_croucher@yahoo.com>
 Tom Purcell <tpurcell@chariotsolutions.com> tpurcell <tpurcell@chariotsolutions.com>
diff --git a/AUTHORS b/AUTHORS
index bf2b55fbfab..a61c4010be5 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -808,7 +808,7 @@ David Boivin <dave.a.boivin@gmail.com>
 Liang-Chi Hsieh <viirya@appier.com>
 Timothy Gu <timothygu99@gmail.com>
 Fábio Santos <fabiosantosart@gmail.com>
-Myles Borins <myles.borins@gmail.com>
+Myles Borins <mylesborins@github.com>
 Jonas Dohse <jonas@dohse.ch>
 Коренберг Марк <mark@ideco.ru>
 Caleb Boyd <caleb.boyd@gmail.com>
@@ -890,7 +890,7 @@ Michael Theriot <michael.lee.theriot@gmail.com>
 Peter Geiss <peter.w.geiss@gmail.com>
 Richard Lau <rlau@redhat.com>
 José Moreira <jose.moreira@findhit.com>
-Tom Atkinson <atkinson.tommy@nsoft.ba>
+Tom Atkinson <atkinson.tommy@nsoft.com>
 Glen Arrowsmith <glen.arrowsmith@gmail.com>
 Jeff Harris <techjeffharris@gmail.com>
 Alexander Makarenko <estliberitas@gmail.com>
@@ -1429,7 +1429,6 @@ Rj Bernaldo <rj.bernaldo@gmail.com>
 John F. Mercer <john.f.mercer@gmail.com>
 Dejon "DJ" Gill <itsmed@users.noreply.github.com>
 Ahmad Nassri <ahmad@ahmadnassri.com>
-Tom Atkinson <atkinson.tommy@nhome.ba>
 Tobias Nießen <tniessen@tnie.de>
 Joseph Gentle <me@josephg.com>
 Arunesh Chandra <arunesh.chandra@microsoft.com>
@@ -3021,5 +3020,124 @@ David Gilbertson <gilbertson.david@gmail.com>
 Sergey Zelenov <sergey.zelenov@getyourguide.com>
 Eric Bickle <ebickle@users.noreply.github.com>
 Joe Pea <joe@trusktr.io>
+ExE Boss <3889017+ExE-Boss@users.noreply.github.com>
+Mateusz Krawczuk <krawczukmat@gmail.com>
+Jonathan MERCIER <jmercier@cng.fr>
+Ujjwal Sharma <ryzokuken@igalia.com>
+Jichan <development@jc-lab.net>
+Hassaan Pasha <hassaan.pasha@teamo.io>
+Eric Dobbertin <eric@dairystatedesigns.com>
+Victor <doc999tor@gmail.com>
+Ling Samuel <lingsamuelgrace@gmail.com>
+Syohei YOSHIDA <syohex@gmail.com>
+Nitin Kumar <snitin315@gmail.com>
+Christian Niederer <aqpoba@gmail.com>
+Sk Sajidul Kadir <sheikh.sajid522@gmail.com>
+Bartlomiej Brzozowski <bart.brzozowski@janeasystems.com>
+Saajan <saajan.sn@gmail.com>
+Yash Ladha <yashladhapankajladha123@gmail.com>
+Xu Meng <dmabupt@gmail.com>
+Alex R <alexei.rudenko@gmail.com>
+Hachimi Aa (Sfeir) <hachimi.aa@sfeir.com>
+Daniel Estiven Rico Posada <danielrico.posada@gmail.com>
+Andrés M. Gómez <andres86mauricio@hotmail.com>
+Nick Kreeger <nick.kreeger@gmail.com>
+Moni <40552237+NotMoni@users.noreply.github.com>
+Dave Vandyke <kzar@kzar.co.uk>
+Agustin Daguerre <agustin.s.daguerre@gmail.com>
+Jesus Hernandez <jesusbeckan@gmail.com>
+龙腾道 <LongTengDao@LongTengDao.com>
+John Kleinschmidt <jkleinsc@github.com>
+Cecchi MacNaughton <cecchi.macnaughton@gmail.com>
+Reşat SABIQ <haqer@gmx.fr>
+daemon1024 <barun1024@gmail.com>
+Qinhui Chen <lianxuify@gmail.com>
+William Bonawentura <sla100@poczta.fm>
+Vadzim Zieńka <v@vadzim.info>
+David Daza <03dazal@gmail.com>
+雨夜带刀 <chenmnkken@gmail.com>
+karan singh virdi <karan1205singh@gmail.com>
+William Armiros <54150514+willarmiros@users.noreply.github.com>
+Matt Kulukundis <matt.fowles@gmail.com>
+Edward Elric <sasuke688848@gmail.com>
+Prosper Opara <oparaprosper79@gmail.com>
+Eileen <eileenlu0306@gmail.com>
+Ishaan Jain <37652866+ishaanjain1898@users.noreply.github.com>
+Christopher Beeson <christopher@bl-ue.com>
+thecodrr <thecodrr@protonmail.com>
+Chris Holland <chrisholland3553@gmail.com>
+Ranjan Purbey <ranjan.purbey@gmail.com>
+白一梓 <yunnysunny@gmail.com>
+John Leidegren <john@leidegren.se>
+Karol Walasek <coreconviction@gmail.com>
+osher <osher.filter@gmail.com>
+szTheory <szTheory@users.noreply.github.com>
+Jonathan Buhacoff <jonathan@buhacoff.net>
+Paolo Insogna <paolo@cowtech.it>
+Richard Townsend <Richard.Townsend@arm.com>
+Dan Fabulich <dan@fabulich.com>
+Deep310 <55121371+Deep310@users.noreply.github.com>
+Dominykas Blyžė <hello@dominykas.com>
+Wenning Zhang <1527841714@qq.com>
+shisama <shisama07@gmail.com>
+Kirill Shatskiy <shaackiy@gmail.com>
+Ben Bucksch <ben.bucksch@beonex.com>
+Eli Schwartz <eschwartz@archlinux.org>
+Maciej Kacper Jagiełło <maciej@jagiello.it>
+Tom Nagle <tomanagle@gmail.com>
+rickyes <ives199511@gmail.com>
+sapics <gv.nishino@gmail.com>
+Sagar Jadhav <sagarj.jadhav23@gmail.com>
+Dennis Ameling <dennis@dennisameling.com>
+Todd Short <tshort@akamai.com>
+Lucas Pardue <lucaspardue.24.7@gmail.com>
+Pragyan Das <pragyandas@msn.com>
+Shakil-Shahadat <shakil.regi@gmail.com>
+wenningplus <zhangwenning@videopls.com>
+WilliamConnatser <43946230+WilliamConnatser@users.noreply.github.com>
+Benjamin Kaduk <bkaduk@akamai.com>
+Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
+Nathan Blair <engineer.nblair@gmail.com>
+patr0nus <dk4rest@gmail.com>
+Alec Davidson <davidson9076@gmail.com>
+falguniraina <48027052+falguniraina@users.noreply.github.com>
+Rodion Abdurakhimov <rodion.arr.web@gmail.com>
+Anentropic <ego@anentropic.com>
+Saleem <hamids2@asme.org>
+Julien Poissonnier <julien@caffeine.lu>
+zombieleet <zombieleetnca@gmail.com>
+Nikola Glavina <nikola.glavina@student.um.si>
+Johannes Schöpp <schoepp@rz.uni-frankfurt.de>
+Francisco Ryan Tolmasky I <tolmasky@gmail.com>
+Ye-hyoung Kang <keepyourhonor@gmail.com>
+Jucke <cosmoslovesyou@gmail.com>
+Pekka Nikander <pekka.nikander@iki.fi>
+iandrc <hao8@protonmail.com>
+Tim Perry <pimterry@gmail.com>
+Corey Butler <corey@coreybutler.com>
+aetheryx <zainalih3c@gmail.com>
+Robey Pointer <robeypointer@gmail.com>
+Priyank Singh <priyanksingh8@gmail.com>
+Gabriele Greco <gabrielegreco@gmail.com>
+Renato Mariscal <renatomariscal@users.noreply.github.com>
+Matthew McEachen <matthew@photostructure.com>
+Voltra <Voltra@users.noreply.github.com>
+davkor <david@adalogics.com>
+Carlos Lopez <clshortfuse@gmail.com>
+Hilla Shahrabani <hilla.sh@gmail.com>
+Frank Lemanschik <frank@github.dspeed.eu>
+Justice Almanzar <superdash993@gmail.com>
+Maksim Sinik <maksim@sinik.it>
+João Lucas Lucchetta <joao.lucas.lucchetta@gmail.com>
+Danny Guo <danny@dannyguo.com>
+Turner Jabbour <doubleujabbour@gmail.com>
+Igor Mikhalev <mr.igor.mikhalev@gmail.com>
+DeeDeeG <DeeDeeG@users.noreply.github.com>
+KuthorX <kuthorx@gmail.com>
+Pooja D.P <Pooja.D.P@ibm.com>
+Shigma <33423008+Shigma@users.noreply.github.com>
+atian25@qq.com <atian25@qq.com>
+Amila Welihinda <amilajack@gmail.com>
+schamberg97 <50446906+schamberg97@users.noreply.github.com>
 
 # Generated by tools/update-authors.js