diff --git a/.mailmap b/.mailmap
index fd6816a5dce7d3..f04496bf3b51ca 100644
--- a/.mailmap
+++ b/.mailmap
@@ -188,6 +188,8 @@ 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>
 Kelsey Breseman <ifoundthemeaningoflife@gmail.com>
+Khaidi Chu <admin@xcoder.in> XadillaX <admin@xcoder.in>
+Khaidi Chu <admin@xcoder.in> <i@2333.moe>
 Kiyoshi Nomo <tokyoincidents.g@gmail.com> kysnm <tokyoincidents.g@gmail.com>
 Koichi Kobayashi <koichik@improvement.jp>
 Kris Kowal <kris.kowal@cixar.com>
@@ -264,6 +266,7 @@ Roman Klauke <romaaan.git@gmail.com> <romankl@users.noreply.github.com>
 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>
 Russell Dempsey <sgtpooki@gmail.com> <SgtPooki@gmail.com>
 Ryan Dahl <ry@tinyclouds.org>
 Ryan Emery <seebees@gmail.com>
diff --git a/AUTHORS b/AUTHORS
index 8d8e74493aff0a..57d5a25ea0a7e3 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -911,7 +911,7 @@ HUANG Wei <grubbyfans@gmail.com>
 DC <dcposch@dcpos.ch>
 Daniel Turing <mail@danielturing.com>
 Julie Pagano <julie.pagano@gmail.com>
-Ruben Bridgewater <ruben.bridgewater@fintura.de>
+Ruben Bridgewater <ruben@bridgewater.de>
 Felix Becker <felix.b@outlook.com>
 Igor Klopov <igor@klopov.com>
 Tsarevich Dmitry <dimhotepus@users.noreply.github.com>
@@ -1493,7 +1493,7 @@ Sreepurna Jasti <sreepurna.jasti@gmail.com>
 Rafael Fragoso <rafaelfragosom@gmail.com>
 Andrei Cioromila <andrei.cioromila@gmail.com>
 Frank Lanitz <frank@frank.uvena.de>
-XadillaX <admin@xcoder.in>
+Khaidi Chu <admin@xcoder.in>
 Akshay Iyer <c.m.akshay.iyer@gmail.com>
 Rick Bullotta <RickBullotta@users.noreply.github.com>
 Rajaram Gaunker <zimbabao@gmail.com>
@@ -1532,7 +1532,6 @@ Dan Homola <dan.homola@hotmail.cz>
 cornholio <0@mcornholio.ru>
 Tamás Hódi <tamas.hodi@risingstack.com>
 DuanPengfei <2459714173@qq.com>
-Ruben Bridgewater <ruben@bridgewater.de>
 Lakshmi Swetha Gopireddy <lakshmiswethagopireddy@gmail.com>
 Rob Wu <rob@robwu.nl>
 Steven Winston <swinston100@hotmail.com>
@@ -2036,5 +2035,34 @@ Hannes Magnusson <hannes.magnusson@creditkarma.com>
 ChungNgoops <mr.mvagusta@gmail.com>
 Jose M. Palacios Diaz <jmpd1988@gmail.com>
 hmammedzadeh <hasan.mammed-zadeh@commercetools.de>
+IHsuan <frostyjoan0829@livemail.tw>
+Francisco Gerardo Neri Andriano <on_neri@hotmail.com>
+Shilo Mangam <smangam@gmail.com>
+idandagan1 <idandagan1@gmail.com>
+Cameron Moorehead <hello@cameronmoorehead.com>
+TomerOmri <tomer92@gmail.com>
+Collins Abitekaniza <abtcolns@gmail.com>
+Federico Kauffman <fede.kau@gmail.com>
+Benno Fünfstück <benno.fuenfstueck@gmail.com>
+Ram Goli <ramsgoli@gmail.com>
+babygoat <babygoat1124@gmail.com>
+Will Clark <willclarktech@users.noreply.github.com>
+Jem Bezooyen <jem@hipmedia.ca>
+Haejin Jo <professionalhaejin@gmail.com>
+Hakan Kimeiga <hak7alp@gmail.com>
+Tyler <tyler.z.yang@gmail.com>
+Shinya Kanamaru <mn131bb@gmail.com>
+you12724 <you12724@gmail.com>
+routerman <h.okano.looz@gmail.com>
+April Webster <awebster@us.ibm.com>
+Jure Triglav <juretriglav@gmail.com>
+alnyan <qShadowp@gmail.com>
+rt33 <rt33@lastcycle.com>
+Ulmanb <barulman@gmail.com>
+xortiz <xavier.ortiz.ch@gmail.com>
+Waleed Ashraf <waleedashraf@outlook.com>
+Mir Mufaqam Ali <mannanali413@gmail.com>
+Nicholas Drane <nicholasdrane@gmail.com>
+Shobhit Chittora <chittorashobhit@gmail.com>
 
 # Generated by tools/update-authors.sh