diff --git a/.mailmap b/.mailmap
index 415e8a178..520f71be6 100644
--- a/.mailmap
+++ b/.mailmap
@@ -5,3 +5,4 @@
 <bertbelder@gmail.com> <info@2bs.nl>
 <alan@prettyrobots.com> <alan@blogometer.com>
 San-Tai Hsu <vanilla@fatpipi.com>
+Isaac Z. Schlueter <i@izs.me>
diff --git a/AUTHORS b/AUTHORS
index b79028473..eefcd7dc1 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -21,3 +21,6 @@ Clifford Heath <clifford.heath@gmail.com>
 Jorge Chamorro Bieling <jorge@jorgechamorro.com>
 Luis Lavena <luislavena@gmail.com>
 Matthew Sporleder <msporleder@gmail.com>
+Erick Tryzelaar <erick.tryzelaar@gmail.com>
+Isaac Z. Schlueter <i@izs.me>
+Pieter Noordhuis <pcnoordhuis@gmail.com>