diff --git a/.mailmap b/.mailmap
index 811ce2b2e7cc998e305320396eca63789ad24ad7..4d08f86d60385ea5c128d0d78bd139579e8ef0f8 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,5 +1,7 @@
 Adam Goertz <adambgoertz@gmail.com>
 Alex Rønne Petersen <alex@alexrp.com>
+Ali Chraghi <alichraghi@proton.me>
+Ali Chraghi <alichraghi@proton.me> <alichraghi@noreply.codeberg.org>
 Ali Chraghi <alichraghi@proton.me> <alichraghi@pm.me>
 Andrea Orru <andrea@orru.io> <andreaorru1991@gmail.com>
 Andrew Kelley <andrew@ziglang.org> <andrewrk@noreply.codeberg.org>
@@ -8,12 +10,14 @@ 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>
+Casey Banner <kcbanner@gmail.com> <kcbanner@noreply.codeberg.org>
 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> <87927264+Rexicon226@users.noreply.github.com>
 David Rubin <david@vortan.dev> <daviru007@icloud.com>
+David Rubin <david@vortan.dev> <sinon@vortan.dev>
 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>
@@ -41,8 +45,8 @@ Isaac Freund <mail@isaacfreund.com> <isaac.freund@coil.com>
 Ivan Stepanov <ivanstepanovftw@gmail.com>
 Jacob G-W <jacoblevgw@gmail.com>
 Jacob Young <jacobly@ziglang.org>
-Jacob Young <jacobly@ziglang.org> <jacobly0@users.noreply.github.com>
 Jacob Young <jacobly@ziglang.org> <15544577+jacobly0@users.noreply.github.com>
+Jacob Young <jacobly@ziglang.org> <jacobly0@users.noreply.github.com>
 Jacob Young <jacobly@ziglang.org> <jacobly@noreply.codeberg.org>
 Jakub Konka <kubkon@jakubkonka.com> <jakub.konka@golem.network>
 Jan Philipp Hafer <jan.hafer@rwth-aachen.de> <anon_1plus1equals3@mailbox.org>
@@ -55,13 +59,18 @@ 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>
+Justus Klausecker <justus@klausecker.de>
+Justus Klausecker <justus@klausecker.de> <justusk@noreply.codeberg.org>
 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>
 LemonBoy <thatlemon@gmail.com> <LemonBoy@users.noreply.github.com>
+Linus Groh <mail@linusgroh.de>
 Lucas Santos <lucascarvalhosantos91@gmail.com>
 Lucas Santos <lucascarvalhosantos91@gmail.com> <117400842+LucasSantos91@users.noreply.github.com>
+Lukáš Lalinský <lukas@lalinsky.com>
+Lukáš Lalinský <lukas@lalinsky.com> <lukasl@noreply.codeberg.org>
 Luuk de Gram <luuk@degram.dev> <Luukdegram@users.noreply.github.com>
 Marc Tiehuis <marc@tiehu.is> <marctiehuis@gmail.com>
 Mason Remaley <mason@anthropicstudios.com>
@@ -81,6 +90,8 @@ 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>
+Ryan Mehri <rmehri01@pm.me>
+Ryan Mehri <rmehri01@pm.me> <ryan.mehri1@gmail.com>
 Techatrix <techatrix@mailbox.org> <19954306+Techatrix@users.noreply.github.com>
 Tobias Simetsreiter <dasimmet@gmail.com>
 Tobias Simetsreiter <dasimmet@gmail.com> <tobias.simetsreiter@meliot.de>
@@ -100,6 +111,8 @@ 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>
+c-kappel <chrisjkappel@gmail.com>
+c-kappel <chrisjkappel@gmail.com> <c-kappel@noreply.codeberg.org>
 february cozzocrea <february.cozzocrea@gmail.com> <91439207+f-cozzocrea@users.noreply.github.com>
 kj4tmp <kj4tmp@gmail.com>
 kj4tmp <kj4tmp@gmail.com> <56497124+kj4tmp@users.noreply.github.com>
@@ -107,7 +120,7 @@ rpkak <rpkak@noreply.codeberg.org> <rpkak@users.noreply.github.com>
 saurabh <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>
 xtex <xtex@astrafall.org>
 xtex <xtex@astrafall.org> <xtex@aosc.io>
 xtex <xtex@astrafall.org> <xtexchooser@duck.com>
+zenith391 <pawalamde@gmail.com> <39484230+zenith391@users.noreply.github.com>