diff --git a/.mailmap b/.mailmap
index ef153384826..a538584de10 100644
--- a/.mailmap
+++ b/.mailmap
@@ -27,6 +27,7 @@ Amery <amery@xiangfa.org>
 Amit Bendor <ajbendor@gmail.com>
 Anatoli Papirovski <apapirovski@mac.com> <anatoli.papirovski@postmates.com>
 Andreas Offenhaeuser <offenhaeuser@gmail.com>
+Andreas Schwab <schwab@linux-m68k.org> <schwab@suse.de>
 Andrew Hughes <Andrew.Hughes1@ibm.com> <andrew.hughes.101@outlook.com>
 Andy Bettisworth <andy.bettisworth@accreu.com>
 Angel Stoyanov <atstojanov@gmail.com>
@@ -78,6 +79,7 @@ Brandon Kobel <kobelb@gmail.com> <brandon.kobel@elastic.co>
 Brendan Ashworth <brendan.ashworth@me.com> <squirrelslikeacorns@gmail.com>
 Brent Pendergraft <bpent3l@gmail.com>
 Brett Kiefer <kiefer@gmail.com> <brett@trello.com>
+Brian Muenzenmeyer <brian.muenzenmeyer@gmail.com> <Brian.Muenzenmeyer@target.com>
 Brian White <mscdex@mscdex.net>
 Brian White <mscdex@mscdex.net> <mscdex@gmail.com>
 Brian White <mscdex@mscdex.net> <mscdex@users.noreply.github.com>
@@ -484,6 +486,7 @@ Stefan Bühler <stbuehler@web.de>
 Stephen Belanger <admin@stephenbelanger.com> <stephen.belanger@datadoghq.com>
 Stephen Belanger <admin@stephenbelanger.com> <stephen.belanger@elastic.co>
 Steve Mao <maochenyan@gmail.com> <maochenyan@msn.com>
+Steven R. Loomis <srl295@gmail.com> <srloomis@us.ibm.com>
 Steven R. Loomis <srloomis@us.ibm.com> <srl@icu-project.org>
 Stewart X Addison <sxa@redhat.com> <sxa@uk.ibm.com>
 Suraiya Hameed <hameedsuraiya@gmail.com>
@@ -549,6 +552,7 @@ Viktor Karpov <viktor.s.karpov@gmail.com>
 Vincent Voyer <v@fasterize.com>
 Vladimir de Turckheim <vlad2t@hotmail.com>
 Vladimir de Turckheim <vlad2t@hotmail.com> <vdeturckheim@users.noreply.github.com>
+Vladimir Morozov <vmorozov@microsoft.com> <vmoroz@users.noreply.github.com>
 vsemozhetbyt <vsemozhetbyt@gmail.com>
 Vyacheslav Egorov <vegorov@chromium.org>
 Wang Xinyong <wang.xy.chn@gmail.com> <wangxy.chn@gmail.com>
diff --git a/AUTHORS b/AUTHORS
index 573bad8606e..1ca80ff7532 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -623,7 +623,7 @@ Patrick Mooney <patrick.f.mooney@gmail.com>
 Jicheng Li <deemstone@gmail.com>
 James Ferguson <jamesanthonyferguson@gmail.com>
 Julien Fontanet <julien.fontanet@isonoe.net>
-Steven R. Loomis <srloomis@us.ibm.com>
+Steven R. Loomis <srl295@gmail.com>
 gyson <eilian.yunsong@gmail.com>
 Steve Sharp <stevenson.sharp@gmail.com>
 Victor Widell <victor@topmost.se>
@@ -3276,7 +3276,7 @@ Rodolfo Carvalho <rhcarvalho@gmail.com>
 Jordan Baczuk <JBaczuk@users.noreply.github.com>
 moander <moander@outlook.com>
 Hitesh Sharma <hitesh9sharma@gmail.com>
-Andreas Schwab <schwab@suse.de>
+Andreas Schwab <schwab@linux-m68k.org>
 Moritz Kneilmann <hi@kneilmann.tech>
 fisker Cheung <lionkay@gmail.com>
 Issam E. Maghni <issam.e.maghni@mailbox.org>
@@ -3522,7 +3522,7 @@ Claudio Wunder <cwunder@gnome.org>
 Shrujal Shah <shrujalshah@hotmail.com>
 Taha-Chaudhry <46199675+Taha-Chaudhry@users.noreply.github.com>
 smitley <brandon.smitley@gmail.com>
-Brian Muenzenmeyer <Brian.Muenzenmeyer@target.com>
+Brian Muenzenmeyer <brian.muenzenmeyer@gmail.com>
 sidwebworks <xodedeveloper@gmail.com>
 Connor Burton <me@connorburton.com>
 chexiongsheng <chexiongsheng@qq.com>
@@ -3559,5 +3559,12 @@ Michael Rienstra <mrienstra@gmail.com>
 Tho <thoqbk@gmail.com>
 Cesar Mario Diaz <85703766+Cesar-M-Diaz@users.noreply.github.com>
 Khafra <42794878+KhafraDev@users.noreply.github.com>
+github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
+Pierrick Bouvier <101587250+pbo-linaro@users.noreply.github.com>
+KaKa <climba03003@gmail.com>
+Luke Karrys <luke@lukekarrys.com>
+Tim Shilov <tim@shilov.dev>
+Obiwac <obiwac@gmail.com>
+Yu Gu <guyu2876@gmail.com>
 
 # Generated by tools/update-authors.mjs