diff --git a/.mailmap b/.mailmap
index 3a112254..4475f60b 100644
--- a/.mailmap
+++ b/.mailmap
@@ -7,6 +7,7 @@ José Gutiérrez de la Concha <jose@zeroc.com>
 Karl Waclawek <karl@waclawek.net> <karl.waclawek@qlinesolutions.com>
 Karl Waclawek <karl@waclawek.net> <kwaclaw@users.sourceforge.net>
 Kishore Kunche <kishore.kunche@intel.com>
+Martin Ettl <ettl.martin78@googlemail.com> <orbitcowboy@web.de>
 Rhodri James <rhodri@wildebeest.org.uk> <rhodri@kynesim.co.uk>
 Rolf Eike Beer <eike@sf-mail.de> <eb@emlix.com>
 Sebastian Pipping <sebastian@pipping.org> <hartwork@users.sourceforge.net>