diff --git a/AUTHORS b/AUTHORS
index 82f77585f3..0af0c7961e 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -28,6 +28,7 @@ The PRIMARY AUTHORS are (and/or have been):
     * Paul McMillan
     * Julien Phalip
     * Aymeric Augustin
+    * Claude Paroz
 
 More information on the main contributors to Django can be found in
 docs/internals/committers.txt.
@@ -398,7 +399,6 @@ answer newbie questions, and generally made Django that much better:
     oggie rob <oz.robharvey@gmail.com>
     oggy <ognjen.maric@gmail.com>
     Jay Parlar <parlar@gmail.com>
-    Claude Paroz <claude@2xlibre.net>
     Carlos Eduardo de Paula <carlosedp@gmail.com>
     John Paulett <john@paulett.org>
     pavithran s <pavithran.s@gmail.com>
diff --git a/docs/internals/committers.txt b/docs/internals/committers.txt
index 089bb70c5b..ff9d06fc45 100644
--- a/docs/internals/committers.txt
+++ b/docs/internals/committers.txt
@@ -342,6 +342,19 @@ Honza Král
 .. _Aymeric Augustin: http://myks.org/
 .. _management consulting company: http://www.polyconseil.fr/
 
+`Claude Paroz`_
+    Claude is a former teacher who fell in love with free software at the
+    beginning of the 21st century. He's now working as freelancer in Web
+    development in his native Switzerland. He has found in Django a perfect
+    match for his needs of a stable, clean, documented and well-maintained Web
+    framework.
+
+    He's also helping the GNOME Translation Project as maintainer of the
+    Django-based `l10n.gnome.org`_.
+
+.. _Claude Paroz: http://www.2xlibre.net
+.. _l10n.gnome.org: http://l10n.gnome.org
+
 Specialists
 -----------