diff --git a/.mailmap b/.mailmap
index 3d4281b9ff..c989284b0a 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,16 +1,19 @@
 Adam Goertz <adambgoertz@gmail.com>
+Alex Rønne Petersen <alex@alexrp.com>
 Ali Chraghi <alichraghi@proton.me> <alichraghi@pm.me>
 Andrea Orru <andrea@orru.io> <andreaorru1991@gmail.com>
-Andrew Kelley <andrew@ziglang.org> <superjoe30@gmail.com>
 Andrew Kelley <andrew@ziglang.org> <andrewrk@noreply.codeberg.org>
+Andrew Kelley <andrew@ziglang.org> <superjoe30@gmail.com>
+Andrew Kraevskiii <andrew.kraevskii@gmail.com>
 Bogdan Romanyuk <wrongnull@gmail.com> <65823030+wrongnull@users.noreply.github.com>
+Carl Åstholm <carl@astholm.se>
 Casey Banner <kcbanner@gmail.com>
 Dacheng Gao <successgdc@gmail.com>
 Daniel Kongsgaard <dakongsgaard@gmail.com>
 David Carlier <devnexen@gmail.com>
 David Rubin <david@vortan.dev>
-David Rubin <david@vortan.dev> <daviru007@icloud.com>
 David Rubin <david@vortan.dev> <87927264+Rexicon226@users.noreply.github.com>
+David Rubin <david@vortan.dev> <daviru007@icloud.com>
 David Senoner <seda18@rolmail.net>
 Dominic <4678790+dweiller@users.noreply.github.com>
 Dominic <4678790+dweiller@users.noreply.github.com> <4678790+dweiller@users.noreplay.github.com>
@@ -22,22 +25,27 @@ Felix "xq" Queißner <xq@random-projects.net> <felix@ib-queissner.de>
 Felix "xq" Queißner <xq@random-projects.net> <git@masterq32.de>
 Felix "xq" Queißner <xq@random-projects.net> <git@mq32.de>
 Felix "xq" Queißner <xq@random-projects.net> <git@random-projects.net>
+FnControlOption <fncontroloption@noreply.codeberg.org> <70830482+FnControlOption@users.noreply.github.com>
 Frank Denis <124872+jedisct1@users.noreply.github.com> <github@pureftpd.org>
 Frank Denis <124872+jedisct1@users.noreply.github.com> <jedisct1@noreply.codeberg.org>
-Garrett Beck <garrettlennoxbeck@gmail.com> <138411610+garrettlennoxbeck@users.noreply.github.com>
-Gaëtan S <blaxoujunior@gmail.com>
 GalaxyShard <dominic.adragna@byteroach.com>
 GalaxyShard <dominic.adragna@byteroach.com> <76917584+GalaxyShard@users.noreply.github.com>
+Garrett Beck <garrettlennoxbeck@gmail.com> <138411610+garrettlennoxbeck@users.noreply.github.com>
+GasInfinity <me@gasinfinity.dev> <58077502+GasInfinity@users.noreply.github.com>
+Gaëtan S <blaxoujunior@gmail.com>
 HydroH <iodizon@163.com> <ixlesis@gmail.com>
 Igor Anić <igor.anic@gmail.com>
 IntegratedQuantum <jahe788@gmail.com> <43880493+IntegratedQuantum@users.noreply.github.com>
 Isaac Freund <mail@isaacfreund.com> <ifreund@ifreund.xyz>
 Isaac Freund <mail@isaacfreund.com> <isaac.freund@coil.com>
 Ivan Stepanov <ivanstepanovftw@gmail.com>
+Jacob G-W <jacoblevgw@gmail.com>
 Jacob Young <amazingjacob@gmail.com>
-Jacob Young <amazingjacob@gmail.com> <jacobly0@users.noreply.github.com>
 Jacob Young <amazingjacob@gmail.com> <15544577+jacobly0@users.noreply.github.com>
+Jacob Young <amazingjacob@gmail.com> <jacobly0@users.noreply.github.com>
+Jakub Konka <kubkon@jakubkonka.com> <jakub.konka@golem.network>
 Jan Philipp Hafer <jan.hafer@rwth-aachen.de> <anon_1plus1equals3@mailbox.org>
+Jay Petacat <jay@jayschwa.net>
 Jeremy Volkman <jeremy@jvolkman.com> <jeremy@cedarai.com>
 Jimmi Holst Christensen <jhc@dismail.de> <jhc@dismail.de>
 Jimmi Holst Christensen <jhc@dismail.de> <jhc@liab.dk>
@@ -46,6 +54,7 @@ Jimmi Holst Christensen <jhc@dismail.de> <jimmiholstchristensen@gmail.com>
 Jimmi Holst Christensen <jhc@dismail.de> <rainbowhejsil@gmail.com>
 Joachim Schmidt <joachim.schmidt557@outlook.com>
 Jonathan Marler <johnnymarler@gmail.com> <jonathan.j.marler@hp.com>
+Kendall Condon <goon.pri.low@gmail.com>
 Kendall Condon <goon.pri.low@gmail.com> <149842806+gooncreeper@users.noreply.github.com>
 Krzysztof Wolicki <der.teufel.mail@gmail.com>
 Krzysztof Wolicki <der.teufel.mail@gmail.com> <46651553+der-teufel-programming@users.noreply.github.com>
@@ -61,6 +70,7 @@ Matthew Lugg <mlugg@mlugg.co.uk> <mlugg@noreply.codeberg.org>
 Meghan Denny <hello@nektro.net>
 Meghan Denny <hello@nektro.net> <meghan@bun.sh>
 Michael Bartnett <michael.bartnett@gmail.com> <michaelbartnett@users.noreply.github.com>
+Michael Dusan <michael.dusan@gmail.com> <mikdusan@noreply.codeberg.org>
 Motiejus Jakštys <motiejus@jakstys.lt> <motiejus@uber.com>
 Niles Salter <Validark@pm.me>
 Noam Preil <noam@pixelhero.dev> <pleasantatk@gmail.com>
@@ -69,6 +79,8 @@ Paul Berg <paul@plutojl.org> <9824244+Pangoraw@users.noreply.github.com>
 Paul Berg <paul@plutojl.org> <paul.berg@univ-ubs.fr>
 Pavel Verigo <paul.verigo@gmail.com> <58272683+pavelverigo@users.noreply.github.com>
 Prokop Randáček <prokop@rdck.dev>
+Ryan Liptak <squeek502@hotmail.com> <squeek502@noreply.codeberg.org>
+Techatrix <techatrix@mailbox.org> <19954306+Techatrix@users.noreply.github.com>
 Tobias Simetsreiter <dasimmet@gmail.com>
 Tobias Simetsreiter <dasimmet@gmail.com> <tobias.simetsreiter@meliot.de>
 Tobias Simetsreiter <dasimmet@gmail.com> <tobias.simetsreiter@wabtec.com>
@@ -84,11 +96,14 @@ Will Lillis <will.lillis24@gmail.com>
 Will Lillis <will.lillis24@gmail.com> <wlillis@umass.edu>
 Wooster <r00ster91@proton.me>
 Wooster <r00ster91@proton.me> <wooster0@proton.me>
+Zhenming-Lin <3575188313@qq.com> <95759947+Zhenming-Lin@users.noreply.github.com>
 antlilja <liljaanton2001@gmail.com> <12533691+antlilja@users.noreply.github.com>
+arrisonhh <garrisonhh@pm.me> <71951273+garrisonhh@users.noreply.github.com>
 february cozzocrea <february.cozzocrea@gmail.com> <91439207+f-cozzocrea@users.noreply.github.com>
-garrisonhh <garrisonhh@pm.me> <71951273+garrisonhh@users.noreply.github.com>
 kj4tmp <kj4tmp@gmail.com>
 kj4tmp <kj4tmp@gmail.com> <56497124+kj4tmp@users.noreply.github.com>
+rpkak <rpkak@noreply.codeberg.org> <rpkak@users.noreply.github.com>
 saurabh <saurabhm@proton.me>
-saurabh <tech@saurabh.mozmail.com> <saurabhm@proton.me>
+saurabh <saurabhm@proton.me> <tech@saurabh.mozmail.com>
 xEgoist <egoist@egoistic.dev> <101279047+xEgoist@users.noreply.github.com>
+zenith391 <pawalamde@gmail.com> <39484230+zenith391@users.noreply.github.com>