diff --git a/.mailmap b/.mailmap
index 58d90f30a..e8a33100c 100644
--- a/.mailmap
+++ b/.mailmap
@@ -11,7 +11,8 @@ Markus Waldmüller <markus.waldmueller@netways.de>
 Claudio Kuenzler <ck@claudiokuenzler.com>
 <markus.frosch@icinga.com> <markus@lazyfrosch.de>
 <markus.frosch@icinga.com> <lazyfrosch@icinga.org>
-<thomas.widhalm@netways.de> <widhalmt@widhalmt.or.at>
+<thomas.widhalm@icinga.com> <thomas.widhalm@netways.de>
+<thomas.widhalm@icinga.com> <widhalmt@widhalmt.or.at>
 <assaf@aikilinux.com> <assaf.flatto@livepopuli.com>
 <marius@graylog.com> <marius@torch.sh>
 <jason.young@velaspan.com> <jyoung15@gmail.com>
diff --git a/AUTHORS b/AUTHORS
index 4b79206b1..4fc0169df 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -106,7 +106,7 @@ Stephan Platz <github@paalsteek.de>
 Stephan Tesch <stephan@tesch.cx>
 Steve McMaster <mcmaster@hurricanelabs.com>
 Thomas Gelf <thomas@gelf.net>
-Thomas Widhalm <thomas.widhalm@netways.de>
+Thomas Widhalm <thomas.widhalm@icinga.com>
 Tim Hardeck <thardeck@suse.de>
 Timo Buhrmester <van.fstd@gmail.com>
 Tobias Birnbaum <osterd@gmx.de>