diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000..429f3a3
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,2 @@
+Rüdiger Diedrich <dev@rdiedri.ch> <hallo@rdiedri.ch>
+Rüdiger Diedrich <dev@rdiedri.ch> <email@rdiedrich.org>