diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000..28c0689
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1 @@
+Ariadne Conill <ariadne@dereferenced.org> <nenolod@dereferenced.org>
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index 8707a69..1dc77b3 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -16,7 +16,7 @@ and backgrounds, and we cherish our strength in diversity.
 ## Reporting incidents
 
 Please report any incidents which may be perceived as violations to
-`nenolod+conduct@dereferenced.org`.  Incidents will be investigated and,
+`ariadne+conduct@dereferenced.org`.  Incidents will be investigated and,
 if warranted, acted upon.