diff --git a/AUTHORS b/AUTHORS
index 995b787d9d..b056a6190e 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -18,6 +18,7 @@ The PRIMARY AUTHORS are (and/or have been):
     * Karen Tracey
     * Jannis Leidel
     * James Tauber
+    * Alex Gaynor
 
 More information on the main contributors to Django can be found in
 docs/internals/committers.txt.
@@ -180,7 +181,6 @@ answer newbie questions, and generally made Django that much better:
     Jorge Gajon <gajon@gajon.org>
     gandalf@owca.info
     Marc Garcia <marc.garcia@accopensys.com>
-    Alex Gaynor <alex.gaynor@gmail.com>
     Andy Gayton <andy-django@thecablelounge.com>
     Idan Gazit
     geber@datacollect.com
diff --git a/docs/internals/committers.txt b/docs/internals/committers.txt
index b0bb18b955..e230364265 100644
--- a/docs/internals/committers.txt
+++ b/docs/internals/committers.txt
@@ -211,6 +211,17 @@ Karen Tracey
 
 .. _James Tauber: http://jtauber.com/
 
+`Alex Gaynor`_
+    Alex is a student at Rensselaer Polytechnic Institute, and is also an
+    independent contractor.  He found Django in 2007 and has been ever since he
+    found out you don't need to write out your forms by hand.  He has a small
+    obsession with compilers.  He's contributed to the ORM, forms, admin, and
+    other components of Django.
+    
+    Alex lives in Chicago, IL, but spends most of his time in Troy, NY.
+
+.. _Alex Gaynor: http://alexgaynor.net
+
 Specialists
 -----------