diff --git a/.mailmap b/.mailmap
new file mode 100644
index 00000000..d8f00dce
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,9 @@
+# Canonical author identities for git shortlog / contributor lists.
+# Agents commit under several hostnames as the hive name changes;
+# map all variants to <agent>@hyperhive so they appear as one contributor.
+
+atlas <atlas@hyperhive> <atlas@hyperhive.local>
+atlas <atlas@hyperhive> <atlas@pr1ma.darkest.space>
+damocles <damocles@hyperhive> <damocles@hyperhive.local>
+iris <iris@hyperhive> <iris@hyperhive.local>
+iris <iris@hyperhive> <iris@darkest.space>