diff --git a/.mailmap b/.mailmap
index ea4e5076a73dc36dd308785b8c9c64f611d99a0f..59fe04034c8579dd889a3fb7fc37d3cfff3bada7 100644
--- a/.mailmap
+++ b/.mailmap
@@ -94,5 +94,7 @@ Theresa Schollenberger <theresa.schollenberger@iws.uni-stuttgart.de> tkurz <ther
 
 Vishal Jambhekar <vishal.jambhekar@iws.uni-stuttgart.de>
 
-Timo Koch <timokoch@uio.no> <timo.koch@iws.uni-stuttgart.de>
-Timo Koch <timokoch@uio.no> <timokoch@math.uio.no>
+Timo Koch <timok@simula.no> <timo.koch@iws.uni-stuttgart.de>
+Timo Koch <timok@simula.no> <timokoch@math.uio.no>
+Timo Koch <timok@simula.no> <timokoch@uio.no>
+Timo Koch <timok@simula.no> <koch_timo@hotmail.com>