diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000000..59c31e4d9e
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,24 @@
+b <benjamin@tlon.io>
+b <benjamin@tlon.io> <42358674+benjamin-tlon@users.noreply.github.com>
+BernardoDeLaPlaz <BernardoDeLaPlaz@users.noreply.github.com> <40804016+BernardoDeLaPlaz@users.noreply.github.com>
+BernardoDeLaPlaz <BernardoDeLaPlaz@users.noreply.github.com> <tjic_BernardoDeLaPlaz_github@tjic.com>
+Elliot Glaysher <elliot@tlon.io> <glaysher@umich.edu>
+Fang <git@fang.io> <Fang-@users.noreply.github.com>
+Fang <git@fang.io> <fang@fang.io>
+Frank Ch. Eigler <fche@redhat.com> <fche@elastic.org>
+Isaac Visintainer <isaac.visintainer@gmail.com>
+Isaac Visintainer <isaac.visintainer@gmail.com> <isaacv@tlon.io>
+Jared Tobin <jared@jtobin.io> <jared@tlon.io>
+John Franklin <jfranklin9000@gmail.com>
+Joe Bryan <joemfb@gmail.com>
+Jose L. Bellod Cisneros <bellod.cisneros@gmail.com>
+Jōshin <git@wholezero.org>
+Jōshin <git@wholezero.org> <_@wholezero.org>
+Joshua Reagan <joshuareagan@gmail.com>
+Joshua Reagan <joshuareagan@gmail.com> <joshuareagan@users.noreply.github.com>
+Logan Allen <loganallc@gmail.com>
+Logan Allen <loganallc@gmail.com> <logan@tlon.io>
+Matilde Park <matilde@park.computer> <matilde@tlon.io>
+pilfer-pandex <pilfer-pandex@users.noreply.github.com> <47340789+pilfer-pandex@users.noreply.github.com>
+Robert <robert@tlon.io>
+Ted Blackman <ted@tlon.io> <ted@3scan.com>