diff --git a/.mailmap b/.mailmap
index e32a3dfb93..84a1c469c3 100644
--- a/.mailmap
+++ b/.mailmap
@@ -42,17 +42,18 @@ Mathieu Lirzin <mthl@gnu.org> <mthl@openmailbox.org>
 Mathieu Lirzin <mthl@gnu.org> <mathieu.lirzin@openmailbox.org>
 Mathieu Othacehe <m.othacehe@gmail.com>
 Nikita Karetnikov <nikita@karetnikov.org> <nikita.karetnikov@gmail.com>
-ng0 <ng0@n0.is>
-ng0 <ng0@n0.is> <ng0@infotropique.org>
-ng0 <ng0@n0.is> <ng0@no-reply.infotropique.org>
-ng0 <ng0@n0.is> <ng0@no-reply.pragmatique.xyz>
-ng0 <ng0@n0.is> <ng0@pragmatique.xyz>
-ng0 <ng0@n0.is> <contact.ng0@cryptolab.net>
-ng0 <ng0@n0.is> <ng0@we.make.ritual.n0.is>
-ng0 <ng0@n0.is> <ngillmann@runbox.com>
-ng0 <ng0@n0.is> <niasterisk@grrlz.net>
-ng0 <ng0@n0.is> <ng@niasterisk.space>
-ng0 <ng0@n0.is> <ng0@libertad.pw>
+ng0 <ng0@crash.cx>
+ng0 <ng0@crash.cx> ng0 <ng0@n0.is>
+ng0 <ng0@crash.cx> <ng0@infotropique.org>
+ng0 <ng0@crash.cx> <ng0@no-reply.infotropique.org>
+ng0 <ng0@crash.cx> <ng0@no-reply.pragmatique.xyz>
+ng0 <ng0@crash.cx> <ng0@pragmatique.xyz>
+ng0 <ng0@crash.cx> <contact.ng0@cryptolab.net>
+ng0 <ng0@crash.cx> <ng0@we.make.ritual.n0.is>
+ng0 <ng0@crash.cx> <ngillmann@runbox.com>
+ng0 <ng0@crash.cx> <niasterisk@grrlz.net>
+ng0 <ng0@crash.cx> <ng@niasterisk.space>
+ng0 <ng0@crash.cx> <ng0@libertad.pw>
 Pjotr Prins <pjotr.guix@thebird.nl> <pjotr.public01@thebird.nl>
 Pjotr Prins <pjotr.guix@thebird.nl> <pjotr.public12@thebird.nl>
 Pjotr Prins <pjotr.guix@thebird.nl> <pjotr.public12@email>