diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000..f9d5149
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,4 @@
+Cinnamon <cinnamon_oasis@fastmail.com> <cinnamon_bun_github@fastmail.com>
+Cinnamon <cinnamon_oasis@fastmail.com> <32660718+cinnamon-bun@users.noreply.github.com>
+Jonathan Dahan <github@jonathan.is> <hi@jonathan.is>
+kawaiipunk <kawaiipunk@posteo.net> <georgeowell@users.noreply.github.com>