diff --git a/AUTHORS b/AUTHORS
index 5733c431f83..438e3096ed8 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -93,6 +93,7 @@ Moriyoshi Koizumi <mozo@mozo.jp>
 Môshe van der Sterre <moshevds@gmail.com>
 Nicholas Waples <nwaples@gmail.com>
 Nigel Kerr <nigel.kerr@gmail.com>
+Olivier Antoine <olivier.antoine@gmail.com>
 Paolo Giarrusso <p.giarrusso@gmail.com>
 Patrick Gavlin <pgavlin@gmail.com>
 Petar Maymounkov <petarm@gmail.com>
@@ -121,7 +122,7 @@ Vincent Ambo <tazjin@googlemail.com>
 Vinu Rajashekhar <vinutheraj@gmail.com>
 Wei Guangjing <vcc.163@gmail.com>
 William Josephson <wjosephson@gmail.com>
-Yongjian Xu <i3dmaster@gmail.com>
 Yasuhiro Matsumoto <mattn.jp@gmail.com>
+Yongjian Xu <i3dmaster@gmail.com>
 Yuusei Kuwana <kuwana@kumama.org>
 Yuval Pavel Zholkover <paulzhol@gmail.com>
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 1f19a0d3f37..1f551ebcd17 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -54,6 +54,7 @@ Ben Eitzen <eitzenb@golang.org>
 Ben Lynn <benlynn@gmail.com>
 Ben Olive <sionide21@gmail.com>
 Benny Siegert <bsiegert@gmail.com>
+Berengar Lehr <Berengar.Lehr@gmx.de>
 Bill Neubauer <wcn@golang.org> <wcn@google.com>
 Brad Fitzpatrick <bradfitz@golang.org> <bradfitz@gmail.com>
 Brendan O'Dea <bod@golang.org>
@@ -71,7 +72,6 @@ Corey Thomasson <cthom.lists@gmail.com>
 Dan Sinclair <dan.sinclair@gmail.com>
 Daniel Fleischman <danielfleischman@gmail.com>
 Daniel Nadasi <dnadasi@google.com>
-Berengar Lehr <Berengar.Lehr@gmx.de>
 Daniel Theophanes <kardianos@gmail.com>
 Dave Cheney <dave@cheney.net>
 David Anderson <danderson@google.com>
@@ -143,6 +143,7 @@ Môshe van der Sterre <moshevds@gmail.com>
 Nicholas Waples <nwaples@gmail.com>
 Nigel Kerr <nigel.kerr@gmail.com>
 Nigel Tao <nigeltao@golang.org>
+Olivier Antoine <olivier.antoine@gmail.com>
 Paolo Giarrusso <p.giarrusso@gmail.com>
 Patrick Gavlin <pgavlin@gmail.com>
 Petar Maymounkov <petarm@gmail.com>
@@ -162,8 +163,8 @@ Ross Light <rlight2@gmail.com>
 Russ Cox <rsc@golang.org>
 Ryan Hitchman <hitchmanr@gmail.com>
 Sam Thorogood <thorogood@google.com> <sam.thorogood@gmail.com>
-Scott Schwartz <scotts@golang.org>
 Scott Lawrence <bytbox@gmail.com>
+Scott Schwartz <scotts@golang.org>
 Sebastien Binet	<seb.binet@gmail.com>
 Sergei Skorobogatov <skorobo@rambler.ru>
 Sergey 'SnakE' Gromov <snake.scaly@gmail.com>
@@ -174,8 +175,8 @@ Stephen Ma <stephenm@golang.org>
 Stephen Weinberg <stephen@q5comm.com>
 Sven Almgren <sven@tras.se>
 Tarmigan Casebolt <tarmigan@gmail.com>
-Tom Szymanski <tgs@google.com>
 Timo Savola <timo.savola@gmail.com>
+Tom Szymanski <tgs@google.com>
 Tor Andersson <tor.andersson@gmail.com>
 Trevor Strohman <trevor.strohman@gmail.com>
 Vincent Ambo <tazjin@googlemail.com>
@@ -183,8 +184,8 @@ Vinu Rajashekhar <vinutheraj@gmail.com>
 Vish Subramanian <vish@google.com>
 Wei Guangjing <vcc.163@gmail.com>
 William Josephson <wjosephson@gmail.com>
-Yongjian Xu <i3dmaster@gmail.com>
 Yasuhiro Matsumoto <mattn.jp@gmail.com>
+Yongjian Xu <i3dmaster@gmail.com>
 Yuusei Kuwana <kuwana@kumama.org>
 Yuval Pavel Zholkover <paulzhol@gmail.com>
 Yves Junqueira <yves.junqueira@gmail.com>