diff --git a/.mailmap b/.mailmap
index 006e09870..57024760d 100644
--- a/.mailmap
+++ b/.mailmap
@@ -4,6 +4,7 @@ Alexander A. Klimov <alexander.klimov@icinga.com> <alexander.klimov@icinga.com>
 <assaf@aikilinux.com> <assaf.flatto@livepopuli.com>
 <bernd.erk@icinga.com> <bernd.erk@icinga.org>
 <blerim.sheqa@icinga.com> <blerim.sheqa@netways.de>
+<cycloon@is-root.org> <christian.gut@trendswm.de>
 <dirk.goetz@icinga.com> <dirk.goetz@netways.de>
 <eric.lippmann@icinga.com> <eric.lippmann@netways.de>
 <gunnar.beutner@icinga.com> <gunnar.beutner@netways.de>