diff --git a/.mailmap b/.mailmap
index a2cf836e..f8eeffdd 100644
--- a/.mailmap
+++ b/.mailmap
@@ -8,6 +8,7 @@ Frank Denis <github@pureftpd.org>
 Isaac Z. Schlueter <i@izs.me>
 Keno Fischer <kenof@stanford.edu> <kfischer+github@college.harvard.edu>
 Keno Fischer <kenof@stanford.edu> <kfischer@college.harvard.edu>
+Marc Schlaich <marc.schlaich@googlemail.com> <marc.schlaich@gmail.com>
 Robert Mustacchi <rm@joyent.com> <rm@fingolfin.org>
 Ryan Dahl <ryan@joyent.com> <ry@tinyclouds.org>
 Ryan Emery <seebees@gmail.com>
diff --git a/AUTHORS b/AUTHORS
index a9c63bf6..96c6c763 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -99,3 +99,5 @@ Maks Naumov <maksqwe1@ukr.net>
 Sean Farrell <sean.farrell@rioki.org>
 Chris Bank <cbank@adobe.com>
 Geert Jansen <geertj@gmail.com>
+Alex Gaynor <alex.gaynor@gmail.com>
+huxingyi <huxingyi@msn.com>
diff --git a/ChangeLog b/ChangeLog
index fff358e7..7439683a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2013.12.13, Version 0.10.20 (Stable), 04141464dd0fba90ace9aa6f7003ce139b888a40
+
+Changes since version 0.10.19:
+
+* linux: fix up SO_REUSEPORT back-port (Ben Noordhuis)
+
+* fs-event: fix invalid memory access (huxingyi)
+
+
 2013.11.21, Version 0.11.15 (Unstable), bfe645ed7e99ca5670d9279ad472b604c129d2e5
 
 Changes since version 0.11.14: