diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000..5595921
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,3 @@
+<bitwiseman@gmail.com> <lnewman@book.com>
+<vojta.jina@gmail.com> <vojta@google.com>
+<friedel.ziegelmayer@gmail.com> <dignifiedquire@gmail.com>
diff --git a/package.json b/package.json
index a267b47..5320844 100644
--- a/package.json
+++ b/package.json
@@ -47,19 +47,20 @@
   "license": "MIT",
   "contributors": [
     "Maksim Ryzhikov <rv.maksim@gmail.com>",
+    "Friedel Ziegelmayer <dignifiedquire@gmail.com>",
     "Jordan Klassen <jordan@vidigami.com>",
-    "Friedel Ziegelmayer <friedel.ziegelmayer@gmail.com>",
     "Martin Hansen <martin@martinhansen.no>",
-    "Dave Geddes <davidcgeddes@gmail.com>",
-    "Lukasz Bandzarewicz <lucassus@gmail.com>",
     "Pawel Kozlowski <pkozlowski.opensource@gmail.com>",
-    "Aymeric Beaumet <aymeric@beaumet.me>",
+    "Lukasz Bandzarewicz <lucassus@gmail.com>",
+    "Dave Geddes <davidcgeddes@gmail.com>",
+    "Karolis Narkevicius <karolis.n@gmail.com>",
     "Ciro S. Costa <ciro.costa@usp.br>",
-    "Friedel Ziegelmayer <dignifiedquire@gmail.com>",
     "JONATHAN PARK <jonathan@silvenstudios.com>",
+    "Jason Divock <jdivock@gmail.com>",
     "Jeff Jagoda <jeffrey.jagoda@gmail.com>",
     "Jonathan Knapp <jon@coffeeandcode.com>",
-    "Karolis Narkevicius <karolis.n@gmail.com>",
-    "Sahat Yalkabov <sakhat@gmail.com>"
+    "Aymeric Beaumet <aymeric@beaumet.me>",
+    "Sahat Yalkabov <sakhat@gmail.com>",
+    "Tim Macfarlane <timmacfarlane@gmail.com>"
   ]
 }