diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000000..6e5f61fb31
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1 @@
+Kevin Veen-Birkenbach <kevin@veen.world> Environment Test <environment-test@example.invalid>