diff --git a/.mailmap b/.mailmap
index 4f756eca31..85f502161b 100644
--- a/.mailmap
+++ b/.mailmap
@@ -30,10 +30,10 @@ Ludovic Courtès <ludo@gnu.org> <ludovic.courtes@inria.fr>
 Mathieu Lirzin <mthl@gnu.org> <mthl@openmailbox.org>
 Mathieu Lirzin <mthl@gnu.org> <mathieu.lirzin@openmailbox.org>
 Nikita Karetnikov <nikita@karetnikov.org> <nikita.karetnikov@gmail.com>
-ng0 <ngillmann@runbox.com> <ng0@we.make.ritual.n0.is>
-ng0 <ngillmann@runbox.com> <niasterisk@grrlz.net>
-ng0 <ngillmann@runbox.com> <ng@niasterisk.space>
-ng0 <ngillmann@runbox.com> <ng0@libertad.pw>
+ng0 <ng0@we.make.ritual.n0.is> <ngillmann@runbox.com>
+ng0 <ng0@we.make.ritual.n0.is> <niasterisk@grrlz.net>
+ng0 <ng0@we.make.ritual.n0.is> <ng@niasterisk.space>
+ng0 <ng0@we.make.ritual.n0.is> <ng0@libertad.pw>
 Pjotr Prins <pjotr.public01@thebird.nl>
 Pjotr Prins <pjotr.public01@thebird.nl> <pjotr.public12@thebird.nl>
 Raimon Grau <raimonster@gmail.com> <raimon@3scale.net>