diff --git a/AUTHORS b/AUTHORS
index b056a6190e..98e4bb17dc 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -19,6 +19,7 @@ The PRIMARY AUTHORS are (and/or have been):
     * Jannis Leidel
     * James Tauber
     * Alex Gaynor
+    * Andrew Godwin
 
 More information on the main contributors to Django can be found in
 docs/internals/committers.txt.
@@ -191,7 +192,6 @@ answer newbie questions, and generally made Django that much better:
     martin.glueck@gmail.com
     Artyom Gnilov <boobsd@gmail.com>
     Ben Godfrey <http://aftnn.org>
-    Andrew Godwin <andrew@aeracode.org>
     GomoX <gomo@datafull.com>
     Guilherme Mesquita Gondim <semente@taurinus.org>
     Mario Gonzalez <gonzalemario@gmail.com>
diff --git a/docs/internals/committers.txt b/docs/internals/committers.txt
index 9dde5a53a9..29058f00f0 100644
--- a/docs/internals/committers.txt
+++ b/docs/internals/committers.txt
@@ -222,6 +222,17 @@ Karen Tracey
 
 .. _Alex Gaynor: http://alexgaynor.net
 
+`Andrew Godwin`_
+    Andrew is a freelance Python developer and tinkerer, and has been
+    developing against Django since 2007. He graduated from Oxford University
+    with a degree in Computer Science, and has become most well known
+    in the Django community for his work on South, the schema migrations
+    library.
+
+    Andrew lives in London, UK.
+
+.. _Andrew Godwin: http://www.aeracode.org/
+
 Specialists
 -----------