diff --git a/src/documentation/content/xdocs/who.xml b/src/documentation/content/xdocs/who.xml
index 4373f7b9f..8969634e3 100644
--- a/src/documentation/content/xdocs/who.xml
+++ b/src/documentation/content/xdocs/who.xml
@@ -33,21 +33,27 @@
 
   <section><title>Advisors</title>
     <ul>
-       <li><link href="http://jakarta.apache.org/avalon/authors/stefano.html">Stefano Mazzocchi</link> (stefano at apache dot org)
+       <li><link href="http://avalon.apache.org/whoweare/stefano.html">Stefano Mazzocchi</link> (stefano at apache dot org)
        </li>
     </ul>
   </section>
 
+  <section><title>Honorary Committers</title>
+    <ul>
+      <li>Nicola Ken Barozzi (barozzi at nicolaken dot com)</li>
+    </ul>
+  </section>
+
   <section><title>Committers</title>
     <ul>
-      <li><link href="http://trilug.org/~acoliver">Andrew C. Oliver</link> (acoliver at apache dot org)</li>
-      <li><link href="http://www.marcj.com">Marc Johnson</link> (mjohnson at apache dot org)</li>
+      <li><link href="http://cvs.apache.org/~acoliver/">Andrew C. Oliver</link> (acoliver at apache dot org)</li>
+      <li><link href="http://www.marcj.com/">Marc Johnson</link> (mjohnson at apache dot org)</li>
       <li><link href="http://members.iinet.net.au/~gstamp/glen/">Glen Stampoultzis</link> (glens at apache.org)</li>
       <li><link href="http://www.rainer-klute.de/">Rainer Klute</link> (klute at apache dot org)</li>
-      <li>Nicola Ken Barozzi (barozzi at nicolaken dot com)</li>
       <li>Ryan Ackley (sackley at apache dot org)</li>
       <li>Avik Sengupta (avik at apache dot org)</li>
       <li>Shawn Laubach (slaubach at apache dot org)</li>
+      <li><link href="http://cvs.apache.org/~tetsuya/">Tetsuya Kitahata</link> (tetsuya at apache dot org)</li>
     </ul>
   </section>
   <section><title>Developers</title>