diff --git a/AUTHORS b/AUTHORS
index cedff32fe0..3c0cb7a7b5 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -45,6 +45,7 @@ The PRIMARY AUTHORS are (and/or have been):
     * Donald Stufft
     * Daniel Lindsley
     * Marc Tamlyn
+    * Baptiste Mispelon
 
 More information on the main contributors to Django can be found in
 docs/internals/committers.txt.
@@ -413,7 +414,6 @@ answer newbie questions, and generally made Django that much better:
     Slawek Mikula <slawek dot mikula at gmail dot com>
     Katie Miller <katie@sub50.com>
     Shawn Milochik <shawn@milochik.com>
-    Baptiste Mispelon <bmispelon@gmail.com>
     mitakummaa@gmail.com
     Taylor Mitchell <taylor.mitchell@gmail.com>
     mmarshall
diff --git a/docs/internals/committers.txt b/docs/internals/committers.txt
index b56c8e469b..6732f1561f 100644
--- a/docs/internals/committers.txt
+++ b/docs/internals/committers.txt
@@ -526,6 +526,17 @@ Marc Tamlyn
 .. _CCBV: http://ccbv.co.uk/
 .. _Incuna Ltd: http://incuna.com/
 
+Baptiste Mispelon
+    Baptiste discovered Django around the 1.2 version and promptly switched away
+    from his homegrown PHP framework. He started getting more involved in the
+    project after attending DjangoCon EU 2012, mostly by triaging tickets and
+    submitting small patches.
+
+    Baptiste currently lives in Budapest, Hungary and works for `M2BPO`_,
+    a small French company providing services to architects.
+
+.. _M2BPO: http://www.m2bpo.fr
+
 Developers Emeritus
 ===================