diff --git a/.mailmap b/.mailmap
index 48b1909c03..1e24d37a63 100644
--- a/.mailmap
+++ b/.mailmap
@@ -5,15 +5,15 @@ Andrea Brancaleoni <abc@pompel.me> Andrea Brancaleoni <andrea.brancaleoni@cleafy
 Andrea Brancaleoni <abc@pompel.me> Andrea Brancaleoni <miwaxe@gmail.com>
 Andrea Brancaleoni <abc@pompel.me> Andrea Brancaleoni <virus@gmx.us>
 Dominik Honnef <dominik@honnef.co> Dominik Honnef <dominikh@fork-bomb.org>
-Duncaen <duncaen@voidlinux.eu> Duncaen <mail@duncano.de>
-Duncaen <duncaen@voidlinux.eu> Duncan Overbruck <administrator@duncano.de>
-Duncaen <duncaen@voidlinux.eu> Duncan Overbruck <mail@duncano.de>
-Enno Boland <gottox@voidlinux.eu> Enno Boland <eb@s01.de>
-Enno Boland <gottox@voidlinux.eu> Enno Boland <g@s01.de>
-Enno Boland <gottox@voidlinux.eu> Gottox <g@s01.de>
+Duncaen <duncaen@voidlinux.org> Duncaen <mail@duncano.de>
+Duncaen <duncaen@voidlinux.org> Duncan Overbruck <administrator@duncano.de>
+Duncaen <duncaen@voidlinux.org> Duncan Overbruck <mail@duncano.de>
+Enno Boland <gottox@voidlinux.org> Enno Boland <eb@s01.de>
+Enno Boland <gottox@voidlinux.org> Enno Boland <g@s01.de>
+Enno Boland <gottox@voidlinux.org> Gottox <g@s01.de>
 Jan S <jan.schreib@gmail.com> jan-schreib <jan.schreib@gmail.com>
 John Regan <john@jrjrtech.com> John Regan <jregan@mesonet.org>
-Juan RP <xtraeme@voidlinux.eu> Juan RP <xtraeme@gmail.com>
+Juan RP <xtraeme@voidlinux.org> Juan RP <xtraeme@gmail.com>
 Jürgen Buchmüller <pullmoll@t-online.de> Juergen Buchmueller <pullmoll@t-online.de>
 Leah Neukirchen <leah@vuxu.org> Christian Neukirchen <chneukirchen@gmail.com>
 Logen Kain <logen@sudotask.com> Logen Kain <walach.of.harkon@gmail.com>
@@ -31,3 +31,10 @@ pancake <pancake@nopcode.org> radare <pancake@nopcode.org>
 xdave <davehome@redthumb.info.tm> davehome <davehome@redthumb.info.tm>
 yopito <pierre.bourgin@free.fr> yopito <yopito@users.noreply.github.com>
 xo <oh@rotce.de> teldra <teldra@rotce.de>
+
+Duncaen <duncaen@voidlinux.org> Duncaen <duncaen@voidlinux.eu>
+Enno Boland <gottox@voidlinux.org> Enno Boland <gottox@voidlinux.eu>
+Juan RP <xtraeme@voidlinux.org> Juan RP <xtraeme@voidlinux.eu>
+Toyam Cox <Vaelatern@voidlinux.org> Toyam Cox <Vaelatern@voidlinux.eu>
+ananteris <ananteris@voidlinux.org> ananteris <ananteris@voidlinux.eu>
+bougyman <bougyman@voidlinux.org> bougyman <bougyman@voidlinux.eu>