diff --git a/.mailmap b/.mailmap
new file mode 100644
index 00000000000..7e69fea2292
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,2 @@
+<sebastian.thiel@icloud.com> <byronimo@gmail.com>  
+<sebastian.thiel@icloud.com> <sthiel@thoughtworks.com>