diff --git a/.mailmap b/.mailmap
index 3a475ca6db6f887928b796939d28cf377baad042..051908f49434826c333b9d493c607019a5a6fbb8 100644
--- a/.mailmap
+++ b/.mailmap
@@ -89,3 +89,5 @@ Theresa Kurz <theresa.kurz@iws.uni-stuttgart.de> <tkurz@kiddo.iws.uni-stuttgart.
 Theresa Kurz <theresa.kurz@iws.uni-stuttgart.de> tkurz <theresa.kurz@iws.uni-stuttgart.de>
 
 Vishal Jambhekar <vishal.jambhekar@iws.uni-stuttgart.de>
+
+Timo Koch <timokoch@uio.no> <timo.koch@iws.uni-stuttgart.de>