diff --git a/.mailmap b/.mailmap
index 4a2bdf086fb8dd..ef153384826879 100644
--- a/.mailmap
+++ b/.mailmap
@@ -101,6 +101,7 @@ Christian Clauss <cclauss@me.com> <cclauss@bluewin.ch>
 Christophe Naud-Dulude <christophe.naud.dulude@gmail.com>
 Christopher Lenz <cmlenz@gmail.com> <chris@lamech.local>
 Claudio Rodriguez <cjrodr@yahoo.com> <cr@fansworld.tv>
+Clemens Backes <post@clemens-backes.de> <clemensb@chromium.org>
 Colin Ihrig <cjihrig@gmail.com>
 Corey Martin <coreymartin496@gmail.com>
 Cyril Lakech <cyril.lakech@axa.fr> <1169286+clakech@users.noreply.github.com>
@@ -579,6 +580,7 @@ Yoshihiro KIKUCHI <yknetg@gmail.com>
 Yosuke Furukawa <yosuke.furukawa@gmail.com> <furukawa.yosuke@dena.jp>
 Yuichiro MASUI <masui@masuidrive.jp>
 Yuta Hiroto <git@about-hiroppy.com>
+ywave620 <rogertyang@tencent.com> <60539365+ywave620@users.noreply.github.com>
 Zach Bjornson <bjornson@stanford.edu> <zbbjornson@gmail.com>
 Zachary Scott <zachary@zacharyscott.net> <zachary.s.scott@gmail.com>
 Zachary Vacura <admin@hackzzila.com>
diff --git a/AUTHORS b/AUTHORS
index fd7efde7278c32..573bad8606eab4 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -2875,7 +2875,7 @@ Patrick Housley <patrick.f.housley@gmail.com>
 Artem Maksimov <temamaksimov@gmail.com>
 Nolik <nolikfriendly@gmail.com>
 palmires <palmires@example.com>
-Clemens Backes <clemensb@chromium.org>
+Clemens Backes <post@clemens-backes.de>
 Vadim Gorbachev <bmsdave@gmail.com>
 galina.prokofeva <g.k.prokofeva@gmail.com>
 Nadya <nadin.ts@gmail.com>
@@ -3498,7 +3498,7 @@ Lenvin Gonsalves <41874033+98lenvi@users.noreply.github.com>
 Andreu Botella <andreu@andreubotella.com>
 shhh7612 <82669765+shhh7612@users.noreply.github.com>
 Dominic Saadi <dominiceliassaadi@gmail.com>
-ywave620 <60539365+ywave620@users.noreply.github.com>
+ywave620 <rogertyang@tencent.com>
 NicoNekoru <66227158+NicoNekoru@users.noreply.github.com>
 SADIK KUZU <sadikkuzu@hotmail.com>
 flakey5 <73616808+flakey5@users.noreply.github.com>
@@ -3555,5 +3555,9 @@ pete3249 <63552971+pete3249@users.noreply.github.com>
 Bruno Pitrus <brunopitrus@hotmail.com>
 Manuel Spigolon <behemoth89@gmail.com>
 Lorand Horvath <72015221+lorand-horvath@users.noreply.github.com>
+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>
 
 # Generated by tools/update-authors.mjs