diff --git a/.mailmap b/.mailmap
index 9a4876eb0b3..123c16459b9 100644
--- a/.mailmap
+++ b/.mailmap
@@ -31,7 +31,6 @@ pancake <pancake@nopcode.org> pancake <pancake@flubox.(none)>
 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>
@@ -51,3 +50,5 @@ Renato Aguiar <renato@renatoaguiar.net> Renato Aguiar <renato@aguiar.info>
 John <me@johnnynator.dev> John <johnz@posteo.net>
 John <me@johnnynator.dev> John Zimmermann <johnz@posteo.net>
 Daniel Kolesa <daniel@octaforge.org> q66 <daniel@octaforge.org>
+teldra <teldra@rotce.de> Teldra <teldra@rotce.de>
+teldra <teldra@rotce.de> xor <aur@rotce.de>