diff --git a/.mailmap b/.mailmap
index 1502f2442..1fde5f02e 100644
--- a/.mailmap
+++ b/.mailmap
@@ -10,3 +10,4 @@ Markus Waldmüller <markus.waldmueller@netways.de>
 Claudio Kuenzler <ck@claudiokuenzler.com>
 <lazyfrosch@icinga.org> <markus@lazyfrosch.de>
 <thomas.widhalm@netways.de> <widhalmt@widhalmt.or.at>
+<assaf@aikilinux.com> <assaf.flatto@livepopuli.com>
diff --git a/AUTHORS b/AUTHORS
index 66609dfe8..057082b7f 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -6,7 +6,7 @@ Alexander Wirt <formorer@debian.org>
 Andres Ivanov <andres@andres.wtf>
 Andrew Meyer <ameyer+secure@nodnetwork.org>
 Arnd Hannemann <arnd@arndnet.de>
-Assaf Flatto <assaf.flatto@livepopuli.com>
+Assaf Flatto <assaf@aikilinux.com>
 Bastian Guse <bguse@nocopy.de>
 Benedikt Heine <bebe@bebehei.de>
 Bernd Erk <bernd.erk@icinga.org>