diff --git a/.mailmap b/.mailmap
index 2f2a14bc62..3d4281b9ff 100644
--- a/.mailmap
+++ b/.mailmap
@@ -2,6 +2,7 @@ Adam Goertz <adambgoertz@gmail.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>
 Bogdan Romanyuk <wrongnull@gmail.com> <65823030+wrongnull@users.noreply.github.com>
 Casey Banner <kcbanner@gmail.com>
 Dacheng Gao <successgdc@gmail.com>
@@ -22,6 +23,7 @@ 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>
 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>
@@ -55,6 +57,7 @@ Marc Tiehuis <marc@tiehu.is> <marctiehuis@gmail.com>
 Mason Remaley <mason@anthropicstudios.com>
 Mason Remaley <mason@anthropicstudios.com> <MasonRemaley@users.noreply.github.com>
 Matthew Lugg <mlugg@mlugg.co.uk>
+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>