diff --git a/.mailmap b/.mailmap
index 7132327b50..81e31ea2a1 100644
--- a/.mailmap
+++ b/.mailmap
@@ -9,35 +9,38 @@
 # these lists, figure out their GitHub username and add them.
 
 GITHUB: AlexeyMK <alexey@alexeymk.com>
+GITHUB: DenisGorbachev <Denis.Gorbachev@faster-than-wind.ru>
+GITHUB: EOT <eot@gmx.at>
+GITHUB: FooBarWidget <honglilai@gmail.com>
+GITHUB: Maxhodges <Max@whiterabbitpress.com>
+GITHUB: OyoKooN <nathan@sxnlabs.com>
+GITHUB: RobertLowe <robert@iblargz.com>
 GITHUB: ansman <nicklas@ansman.se>
 GITHUB: awwx <andrew.wilcox@gmail.com>
 GITHUB: codeinthehole <david.winterbottom@gmail.com>
 GITHUB: dandv <ddascalescu+github@gmail.com>
-GITHUB: DenisGorbachev <Denis.Gorbachev@faster-than-wind.ru>
 GITHUB: emgee3 <hello@gravitronic.com>
-GITHUB: EOT <eot@gmx.at>
-GITHUB: FooBarWidget <honglilai@gmail.com>
+GITHUB: icellan <icellan@icellan.com>
 GITHUB: jacott <geoffjacobsen@gmail.com>
-GITHUB: Maxhodges <Max@whiterabbitpress.com>
+GITHUB: jfhamlin <jfhamlin@gmail.com>
+GITHUB: marcandre <github@marc-andre.ca>
 GITHUB: meawoppl <meawoppl@gmail.com>
+GITHUB: michaelbishop <michael@michaelsplace.net>
 GITHUB: mitar <mitar.git@tnode.com>
 GITHUB: mitar <mitar.github@tnode.com>
 GITHUB: mizzao <mizzao@gmail.com>
 GITHUB: mquandalle <maxime.quandalle@gmail.com>
 GITHUB: nathan-muir <ndmuir@gmail.com>
-GITHUB: RobertLowe <robert@iblargz.com>
+GITHUB: paulswartz <paulswartz@gmail.com>
+GITHUB: queso <joshua.owens@gmail.com>
+GITHUB: rdickert <robert.dickert@gmail.com>
+GITHUB: rgould <rwgould@gmail.com>
 GITHUB: ryw <ry@rywalker.com>
 GITHUB: rzymek <rzymek@gmail.com>
 GITHUB: sdarnell <stephen@darnell.plus.com>
 GITHUB: timhaines <tmhaines@gmail.com>
-GITHUB: jfhamlin <jfhamlin@gmail.com>
-GITHUB: marcandre <github@marc-andre.ca>
-GITHUB: michaelbishop <michael@michaelsplace.net>
-GITHUB: OyoKooN <nathan@sxnlabs.com>
-GITHUB: paulswartz <paulswartz@gmail.com>
-GITHUB: rdickert <robert.dickert@gmail.com>
-GITHUB: icellan <icellan@icellan.com>
 GITHUB: yeputons <egor.suvorov@gmail.com>
+GITHUB: zol <zol@percolatestudio.com>
 
 METEOR: avital <avital@thewe.net>
 METEOR: debergalis <matt@meteor.com>
diff --git a/History.md b/History.md
index dca21e22b6..b6fd92a861 100644
--- a/History.md
+++ b/History.md
@@ -57,7 +57,7 @@
 * Upgraded dependencies
   - amplify: 1.1.2 (from 1.1.0)
 
-XXX list contributors
+Patches contributed by GitHub users awwx, dandv, queso, rgould, timhaines, zol
 
 
 ## v0.7.1.2