diff --git a/.mailmap b/.mailmap
index 6f8f98d022d..f5462dbb992 100644
--- a/.mailmap
+++ b/.mailmap
@@ -131,6 +131,7 @@ Gabriel de Perthuis <g2p.code@gmail.com>
 Gareth Ellis <gareth.ellis@uk.ibm.com> <gareth@gsellis.com>
 Garwah Lam <garwahlam@gmail.com>
 Geoffrey Bugaisky <gbugaisk@gmail.com> gbugaisky <gbugaisk@gmail.com>
+Gerhard Stoebich <deb2001-github@yahoo.de>
 Gibson Fahnestock <gibfahn@gmail.com> <gib@uk.ibm.com>
 Gil Pedersen <git@gpost.dk> <github@gpost.dk>
 Graham Fairweather <xotic750@gmail.com> Xotic750 <xotic750@gmail>
@@ -204,6 +205,7 @@ Jérémy Lal <kapouer@melix.org> <holisme@gmail.com>
 Juan Sebastian Velez Posada <sebasvelez@gmail.com>
 Kai Sasaki Lewuathe <sasaki_kai@lewuathe.sakura.ne.jp>
 Karl Skomski <karl@skomski.com> <mail@skomski.com>
+Kat Marchán <kzm@zkat.tech> <kzm@sykosomatic.org>
 Kathy Truong <kathy.yvy.truong@gmail.com> k3kathy <kathy.yvy.truong@gmail.com>
 Kazuyuki Yamada <tasogare.pg@gmail.com>
 Keith M Wesolowski <wesolows@joyent.com> <wesolows@foobazco.org>
@@ -238,6 +240,7 @@ Matheus Marchini <mat@mmarchini.me> <matheus@sthima.com.br>
 Matheus Marchini <mat@mmarchini.me> <matheus@sthima.com>
 Matt Lang <matt@mediasuite.co.nz> matt-in-a-hat <matt@mediasuite.co.nz>
 Matt Reed <matthewreed26@gmail.com> matthewreed26 <matthewreed26@gmail.com>
+Matteo Collina <matteo.collina@gmail.com> <hello@matteocollina.com>
 Matthias Bastian <dev@matthias-bastian.de> piepmatz <piepmatz@users.noreply.github.com>
 Mathias Buus <mathiasbuus@gmail.com> <m@ge.tt>
 Mathias Pettersson <mape@mape.me>
@@ -364,6 +367,7 @@ Tadashi SAWADA <cesare@mayverse.jp>
 Takahiro ANDO <takahiro.ando@gmail.com>
 Tarun Batra <tarun.batra00@gmail.com> Tarun <tarun.batra00@gmail.com>
 Ted Young <ted@radicaldesigns.org>
+Teppei Sato <teppeis@gmail.com>
 Thomas Hunter II <me@thomashunter.name> <tom@intrinsic.com>
 Thomas Lee <thomas.lee@shinetech.com> <tom@tom-debian.sensis.com.au>
 Thomas Reggi <thomas@reggi.com>
@@ -391,7 +395,8 @@ Vladimir de Turckheim <vlad2t@hotmail.com>
 vsemozhetbyt <vsemozhetbyt@gmail.com> Vse Mozhet Byt <vsemozhetbyt@gmail.com>
 Wang Xinyong <wang.xy.chn@gmail.com> <wangxy.chn@gmail.com>
 Weijia Wang <381152119@qq.com>
-Weijia Wang <381152119@qq.com> starkewang <starkewang@tencent.com>
+Weijia Wang <381152119@qq.com> <starkwang@126.com>
+Weijia Wang <381152119@qq.com> <starkewang@tencent.com>
 Wei-Wei Wu <wuxx1045@umn.edu>
 Willi Eggeling <email@wje-online.de>
 Will Hayslett <william.hayslettjr@gmail.com>
diff --git a/AUTHORS b/AUTHORS
index 68469ee7632..299800b059f 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -650,7 +650,7 @@ Micleusanu Nicu <micnic90@gmail.com>
 Alejandro Oviedo Garcia <alejandro.oviedo.g@gmail.com>
 Ben Burns <benjamin.c.burns@gmail.com>
 Julian Duque <julianduquej@gmail.com>
-teppeis <teppeis@gmail.com>
+Teppei Sato <teppeis@gmail.com>
 Rudi Cilibrasi <cilibrar@morefuntechnologies.com>
 Tim Ruffles <oi@truffles.me.uk>
 CGavrila <cristi_gavrila1@yahoo.com>
@@ -754,14 +754,14 @@ 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>
+Kat Marchán <kzm@zkat.tech>
 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>
 Phillip Johnsen <johphi@gmail.com>
-Matteo Collina <hello@matteocollina.com>
+Matteo Collina <matteo.collina@gmail.com>
 jomo <github@jomo.tv>
 Gireesh Punathil <gpunathi@in.ibm.com>
 Lucien Greathouse <me@lpghatguy.com>
@@ -1432,23 +1432,25 @@ 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>
+Gabriel Schulhof <gabriel.schulhof@intel.com>
+Ian Halliday <ianhall@microsoft.com>
+Sampson Gao <sampsong@ca.ibm.com>
+Taylor Woll <taylor.woll@microsoft.com>
 Zero King <l2dy@icloud.com>
 Raphael Okon <raphael@okon.io>
 JR McEntee <jrmce12@gmail.com>
 Lovell Fuller <github@lovell.info>
 Jason Marsh <regularly.jason@gmail.com>
 Vinay Hiremath <vhiremath4@gmail.com>
-Gabriel Schulhof <gabriel.schulhof@intel.com>
 alejandro <alemures@hotmail.com>
 dave-k <davek1802@gmail.com>
 Steven <steven@ceriously.com>
 Uppinder Chugh <uppinderchugh@gmail.com>
 Karl Cheng <qantas94heavy@gmail.com>
-Taylor Woll <taylor.woll@microsoft.com>
 Tarun Batra <tarun.batra00@gmail.com>
 Nao YONASHIRO <owan.orisano@gmail.com>
 Christopher Luke <zaide@zaidesthings.com>
-Sampson Gao <sampsong@ca.ibm.com>
 John Paul Bamberg <jpbamberg1993@gmail.com>
 Cody Deckard <cjdeckard@gmail.com>
 Fabio Campinho <fcampinho@gmail.com>
@@ -1488,7 +1490,7 @@ Madara Uchiha <me@madara.ninja>
 Gil Tayar <gil@tayar.org>
 Glenn Schlereth <Glenn.Schlereth@gmail.com>
 Artur G Vieira <vieira.artur.g@gmail.com>
-Flarna <deb2001-github@yahoo.de>
+Gerhard Stoebich <deb2001-github@yahoo.de>
 Sreepurna Jasti <sreepurna.jasti@gmail.com>
 Rafael Fragoso <rafaelfragosom@gmail.com>
 Andrei Cioromila <andrei.cioromila@gmail.com>
@@ -1658,6 +1660,8 @@ Piotr Mionskowski <piotr.mionskowski@gmail.com>
 Cyril Lakech <cyril.lakech@axa.fr>
 Eduard Bondarenko <eduardbcom@gmail.com>
 Adina Shanholtz <ashanhol@gmail.com>
+Guy Bedford <guybedford@gmail.com>
+Jan Krems <jan.krems@groupon.com>
 Miguel Martins <mmartins@uphold.com>
 Yury Popov <github@phoenix.dj>
 George Bezerra <georgelione@gmail.com>
@@ -1670,7 +1674,6 @@ Alex Gresnel <31708810+agresnel@users.noreply.github.com>
 Will Young <lost.networking@gmail.com>
 Martijn Schrage <martijn@oblomov.com>
 Halil İbrahim Şener <hisener@yahoo.com>
-Guy Bedford <guybedford@gmail.com>
 Antoine Amara <amara.antoine@gmail.com>
 Mani Maghsoudlou <manidlou@gmail.com>
 Bartek Szczepański <hello@barnski.pl>
@@ -1884,7 +1887,6 @@ Ashish Kaila <ashishkaila@hotmail.com>
 c0b <14798161+c0b@users.noreply.github.com>
 Damian <damianczapiewski@gmail.com>
 Alec Perkins <alecperkins@gmail.com>
-Teppei Sato <teppeis@gmail.com>
 Jinwoo Lee <jinwoo68@gmail.com>
 Peter Marton <email@martonpeter.com>
 Erwin W. Ramadhan <erwinwahyuramadhan@gmail.com>
@@ -2154,9 +2156,7 @@ Nick Filatov <keddofilatov@gmail.com>
 Jesse Gorzinski <jgorzinski@gmail.com>
 Pieter Mees <pieter.mees@zentrick.com>
 Malcolm White <malcolmwhite@google.com>
-Gerhard Stoebich <deb2001-github@yahoo.de>
 Matei Copot <matei@copot.eu>
-ikasumiwt <wtsnyk13@gmail.com>
 Gurin, Sebastian <sgurin@netsuite.com>
 Indranil Dasgupta <indranild@gmail.com>
 Harry Sarson <harry.sarson@hotmail.co.uk>
@@ -2187,7 +2187,6 @@ Kyle Martin <kyle.martin@hotmail.co.nz>
 Denis Fäcke <serayaeryn@gmail.com>
 Daylor Yanes <daylor.yanes@gmail.com>
 Carrie Coxwell <carrie.coxwell@gmail.com>
-BeniCheni <benjaminlchen@gmail.com>
 Masashi Hirano <cherrydog07@gmail.com>
 Brandon Ruggles <brandonrninefive@gmail.com>
 Allen Yonghuang Wang <helloshuangzi@gmail.com>
@@ -2218,6 +2217,7 @@ Abhimanyu Vashisht <abhimanyuvashisht.av@gmail.com>
 Sagir Khan <sagir.khan@gmail.com>
 Kael Zhang <i+github@kael.me>
 Unknown <bdistin@gmail.com>
+Krzysztof Taborski <taborskikrzysztof@gmail.com>
 Blaine Bublitz <blaine.bublitz@gmail.com>
 Shailesh Shekhawat <sshekhawat356@gmail.com>
 Davis Okoth <davisokoth@gmail.com>
@@ -2236,5 +2236,86 @@ Shelley Vohr <shelley.vohr@gmail.com>
 Deepjyoti Mondal <djmdeveloper060796@gmail.com>
 Brett Kiefer <brett@trello.com>
 Kevin Thomas <kevintab95@gmail.com>
+ZaneHannanAU <ZaneHannanAU@users.noreply.github.com>
+Fernando Doglio <deleteman@gmail.com>
+Renée Kooi <renee@kooi.me>
+Jo Colina <jo@bottomatik.com>
+itaysabato <itaysabato@gmail.com>
+Victor Belozyorov <hi@vbelozyorov.com>
+Joonas Rouhiainen <joonas.rouhiainen@reaktor.com>
+GauthamBanasandra <gautham.bangalore@gmail.com>
+Hugo Josefson <hugo@josefson.org>
+Sam Ruby <rubys@intertwingly.net>
+Haroon Khan <aitchkhan@gmail.com>
+Developer Davo <DeveloperDavo@users.noreply.github.com>
+Jacek Pospychała <jacek.pospychala@currency-one.com>
+MaleDong <maledong_private@qq.com>
+iwko <iwoczerniawski@gmail.com>
+Sohail Rajdev <sohailrajdev97@gmail.com>
+Niicck <niicck@users.noreply.github.com>
+Denys Otrishko <shishugi@gmail.com>
+Sergey Zelenov <mail@zelenov.su>
+Travis Fischer <fisch0920@gmail.com>
+Dominic Farolino <domfarolino@gmail.com>
+Octavian Soldea <octavian.soldea@intel.com>
+XhmikosR <xhmikosr@gmail.com>
+AdityaSrivast <yashsri421@gmail.com>
+Javier Gonzalez <xaviergonz@gmail.com>
+RidgeA <antongriadchenko@gmail.com>
+Ryuichi Sakagami <shagamiiiii@gmail.com>
+hectorcoronado <hectorcoronado.developer@gmail.com>
+Petras <15868923+kimberlake@users.noreply.github.com>
+Kevin Lacabane <5239883+klacabane@users.noreply.github.com>
+Simionescu, Radu <radsimu@gmail.com>
+mariotsi <simone@mariotti.me>
+prayag21 <10997858+prayag21@users.noreply.github.com>
+Bruno Pinho <bpinhosilva@gmail.com>
+Anto Aravinth <anto.aravinth.cse@gmail.com>
+Helio Frota <00hf11@gmail.com>
+Tim Ruffles <timruffles@googlemail.com>
+Jacob Page <jpage@godaddy.com>
+sagulati <sagulati@adobe.com>
+conectado <gabrielalejandro7@gmail.com>
+Vitor Bruno de Oliveira Barth <vbob@vbob.com.br>
+cclauss <cclauss@bluewin.ch>
+James Ide <ide@expo.io>
+MaleDong <maledong_github@outlook.com>
+bhavayAnand9 <bhavayanandcse@gmail.com>
+Brandon Lee <40652534+brandonlwt@users.noreply.github.com>
+Oryan Moshe <iamoryanmoshe@gmail.com>
+Michael Sommer <sommerdrummer@gmail.com>
+Eugene Y. Q. Shen <eugene@eyqs.ca>
+Rishabh Singh <rishabhptr@gmail.com>
+Marco Levrero <marco.levrero@gmail.com>
+Ouyang Yadong <oyydoibh@gmail.com>
+yahavfuchs <yahavf6@gmail.com>
+Thomas Leah <thomas@leahfamily.plus.com>
+Musa Hamwala <musahamwala@icloud.com>
+James Bromwell <james.bromwell@gdit.com>
+Jeremy Apthorp <nornagon@nornagon.net>
+Eugen Cazacu <32613393+oygen87@users.noreply.github.com>
+James Bromwell <943160+thw0rted@users.noreply.github.com>
+Csaba Palfi <csaba@palfi.me>
+Ryan Petrich <rpetrich@gmail.com>
+Andreas Girgensohn <andreasg@fxpal.com>
+Caleb Sander <caleb.sander@gmail.com>
+Dzmitry_Prudnikau <dzmitriyprudnikov@gmail.com>
+Ian McKellar <ianloic@google.com>
+Jennifer Bland <jennifer.bland@sbdinc.com>
+Kyle Fuller <kyle@fuller.li>
+ZYSzys <zyszys98@gmail.com>
+Neeraj Laad <neeraj.laad@uk.ibm.com>
+Scott Van Gilder <svangilder@gmail.com>
+Yaniv Friedensohn <yaniv.friedensohn@gmail.com>
+Lars-Magnus Skog <ralphtheninja@riseup.net>
+Lucas Woo <legendecas@gmail.com>
+Troels Liebe Bentsen <troels@connectedcars.dk>
+pranshuchittora <pranshuchittora17@gmail.com>
+lakamsani <lakamsani@gmail.com>
+Chris White <cxwembedded@gmail.com>
+Ben Newman <ben@meteor.com>
+Szymon Marczak <sz.marczak@gmail.com>
+Tessei Kameyama <kamenoko315@ruri.waseda.jp>
+Chakravarthy S M <chakra.mithun@gmail.com>
 
-# Generated by tools/update-authors.sh
+# Generated by tools/update-authors.js