diff --git a/AUTHORS b/AUTHORS
index 2c3d945b1a..3f682cde69 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -189,7 +189,6 @@ Hong Ruiqi <hongruiqi@gmail.com>
 Icarus Sparry <golang@icarus.freeuk.com>
 Ingo Oeser <nightlyone@googlemail.com>
 Isaac Wagner <ibw@isaacwagner.me>
-JT Olds <jtolds@xnet5.com>
 Jakob Borg <jakob@nym.se>
 Jakub Ryszard Czarnowicz <j.czarnowicz@gmail.com>
 James David Chalfant <james.chalfant@gmail.com>
@@ -237,6 +236,7 @@ Josh Bleecher Snyder <josharian@gmail.com>
 Josh Goebel <dreamer3@gmail.com>
 Josh Holland <jrh@joshh.co.uk>
 Joshua Chase <jcjoshuachase@gmail.com>
+JT Olds <jtolds@xnet5.com>
 Jukka-Pekka Kekkonen <karatepekka@gmail.com>
 Julian Phillips <julian@quantumfyre.co.uk>
 Julien Schmidt <google@julienschmidt.com>
@@ -291,6 +291,7 @@ Michael Fraenkel <michael.fraenkel@gmail.com>
 Michael Gehring <mg@ebfe.org> <gnirheg.leahcim@gmail.com>
 Michael Hoisie <hoisie@gmail.com>
 Michael Lewis <mikelikespie@gmail.com>
+Michael MacInnis <Michael.P.MacInnis@gmail.com>
 Michael Pearson <mipearson@gmail.com>
 Michael Stapelberg <michael@stapelberg.de>
 Michael Teichgräber <mteichgraeber@gmx.de>
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index b20cf055af..a5b4ff843b 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -267,7 +267,6 @@ Icarus Sparry <golang@icarus.freeuk.com>
 Ingo Oeser <nightlyone@googlemail.com> <nightlyone@gmail.com>
 Isaac Wagner <ibw@isaacwagner.me>
 Ivan Krasin <krasin@golang.org>
-JT Olds <jtolds@xnet5.com>
 Jacob Baskin <jbaskin@google.com>
 Jakob Borg <jakob@nym.se>
 Jakub Ryszard Czarnowicz <j.czarnowicz@gmail.com>
@@ -338,6 +337,7 @@ Josh Hoak <jhoak@google.com>
 Josh Holland <jrh@joshh.co.uk>
 Joshua Chase <jcjoshuachase@gmail.com>
 JP Sugarbroad <jpsugar@google.com>
+JT Olds <jtolds@xnet5.com>
 Jukka-Pekka Kekkonen <karatepekka@gmail.com>
 Julian Phillips <julian@quantumfyre.co.uk>
 Julien Schmidt <google@julienschmidt.com>
@@ -410,6 +410,7 @@ Michael Hoisie <hoisie@gmail.com>
 Michael Hudson-Doyle <michael.hudson@linaro.org>
 Michael Kelly <mjk@google.com>
 Michael Lewis <mikelikespie@gmail.com>
+Michael MacInnis <Michael.P.MacInnis@gmail.com>
 Michael Matloob <matloob@google.com>
 Michael Pearson <mipearson@gmail.com>
 Michael Piatek <piatek@google.com>