diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000..a9b7eb4
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,5 @@
+zoey <hi@zoeys.computer> zackartz <zackmyers@lavabit.com>
+zoey <hi@zoeys.computer> zack <me@zackmyers.io>
+zoey <hi@zoeys.computer> zack <hi@zoeys.computer>
+zoey <hi@zoeys.computer> Zachary Myers <hi@zoeys.computer>
+zoey <hi@zoeys.computer> Zachary Myers <zackmyers808@gmail.com>