diff --git a/.mailmap b/.mailmap
new file mode 100644
index 000000000..e4ca5f9b5
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,2 @@
+Ariadne Conill <ariadne@dereferenced.org> <nenolod@dereferenced.org>
+Ariadne Conill <ariadne@dereferenced.org> <nenolod@gmail.com>