diff --git a/AUTHORS b/AUTHORS
index 1ebb56bdaaa..ac22cc6f400 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -16,6 +16,7 @@ The PRIMARY AUTHORS are (and/or have been):
     * Brian Rosner
     * Justin Bronn
     * Karen Tracey
+    * Jannis Leidel
 
 More information on the main contributors to Django can be found in
 docs/internals/committers.txt.
@@ -267,7 +268,6 @@ answer newbie questions, and generally made Django that much better:
     lcordier@point45.com
     Jeong-Min Lee <falsetru@gmail.com>
     Tai Lee <real.human@mrmachine.net>
-    Jannis Leidel <jl@websushi.org>
     Christopher Lenz <http://www.cmlenz.net/>
     lerouxb@gmail.com
     Piotr Lewandowski <piotr.lewandowski@gmail.com>
diff --git a/docs/internals/committers.txt b/docs/internals/committers.txt
index 7326532ec93..803c3140c7d 100644
--- a/docs/internals/committers.txt
+++ b/docs/internals/committers.txt
@@ -148,7 +148,6 @@ Joseph Kocherhans
 
 .. _brian rosner: http://oebfare.com/
 .. _eldarion: http://eldarion.com/
-.. _pinax: http://pinaxproject.com/
 .. _django dose: http://djangodose.com/
 
 `Gary Wilson`_
@@ -189,6 +188,18 @@ Karen Tracey
 
     Karen lives in Apex, NC, USA.
 
+`Jannis Leidel`_
+    Jannis graduated in media design from `Bauhaus-University Weimar`_,
+    is the author of a number of pluggable Django apps and likes to
+    contribute to Open Source projects like Pinax_. He currently works as
+    a freelance web developer and designer.
+
+    Jannis lives in Berlin, Germany.
+
+.. _Jannis Leidel: http://jezdez.com/
+.. _Bauhaus-University Weimar: http://www.uni-weimar.de/
+.. _pinax: http://pinaxproject.com/
+
 Specialists
 -----------