diff --git a/build/jakarta-poi/docs/changes.html b/build/jakarta-poi/docs/changes.html
index 8b22dc8d79..56044ad3da 100644
--- a/build/jakarta-poi/docs/changes.html
+++ b/build/jakarta-poi/docs/changes.html
@@ -106,7 +106,7 @@
 <a href="contrib.html"><font size="-1">Contributing</font></a>
 </li>
 <li>
-<a href="https://sourceforge.net/tracker/?atid=406288&group_id=32701&func=browse"><font size="-1">Bug Database</font></a>
+<a href="http://nagoya.apache.org/bugzilla/buglist.cgi?product=POI"><font size="-1">Bug Database</font></a>
 </li>
 <li>
 <a href="http://jakarta.apache.org/site/cvsindex.html"><font size="-1">CVS</font></a>
@@ -140,7 +140,7 @@
 <div align="right">
 <table cellspacing="0" cellpadding="2" border="0" width="100%">
 <tr>
-<td bgcolor="#525D76"><font color="#ffffff" size="+1"><font face="Arial,sans-serif"><b> 1.1-dev (February 23 2002)</b></font></font></td>
+<td bgcolor="#525D76"><font color="#ffffff" size="+1"><font face="Arial,sans-serif"><b> 1.1-dev (March 1 2002)</b></font></font></td>
 </tr>
 <tr>
 <td>
diff --git a/build/jakarta-poi/docs/contrib.html b/build/jakarta-poi/docs/contrib.html
index 379a80e1ee..7e5698bb99 100644
--- a/build/jakarta-poi/docs/contrib.html
+++ b/build/jakarta-poi/docs/contrib.html
@@ -106,7 +106,7 @@
 <a href="contrib.html"><font size="-1">Contributing</font></a>
 </li>
 <li>
-<a href="https://sourceforge.net/tracker/?atid=406288&group_id=32701&func=browse"><font size="-1">Bug Database</font></a>
+<a href="http://nagoya.apache.org/bugzilla/buglist.cgi?product=POI"><font size="-1">Bug Database</font></a>
 </li>
 <li>
 <a href="http://jakarta.apache.org/site/cvsindex.html"><font size="-1">CVS</font></a>
diff --git a/build/jakarta-poi/docs/faq.html b/build/jakarta-poi/docs/faq.html
index 37eb8cf750..9e1aa409f3 100644
--- a/build/jakarta-poi/docs/faq.html
+++ b/build/jakarta-poi/docs/faq.html
@@ -106,7 +106,7 @@
 <a href="contrib.html"><font size="-1">Contributing</font></a>
 </li>
 <li>
-<a href="https://sourceforge.net/tracker/?atid=406288&group_id=32701&func=browse"><font size="-1">Bug Database</font></a>
+<a href="http://nagoya.apache.org/bugzilla/buglist.cgi?product=POI"><font size="-1">Bug Database</font></a>
 </li>
 <li>
 <a href="http://jakarta.apache.org/site/cvsindex.html"><font size="-1">CVS</font></a>
diff --git a/build/jakarta-poi/docs/historyandfuture.html b/build/jakarta-poi/docs/historyandfuture.html
index 87142da548..2a8a1ba519 100644
--- a/build/jakarta-poi/docs/historyandfuture.html
+++ b/build/jakarta-poi/docs/historyandfuture.html
@@ -106,7 +106,7 @@
 <a href="contrib.html"><font size="-1">Contributing</font></a>
 </li>
 <li>
-<a href="https://sourceforge.net/tracker/?atid=406288&group_id=32701&func=browse"><font size="-1">Bug Database</font></a>
+<a href="http://nagoya.apache.org/bugzilla/buglist.cgi?product=POI"><font size="-1">Bug Database</font></a>
 </li>
 <li>
 <a href="http://jakarta.apache.org/site/cvsindex.html"><font size="-1">CVS</font></a>
diff --git a/build/jakarta-poi/docs/index.html b/build/jakarta-poi/docs/index.html
index 2d2fef2b15..bb34bc194c 100644
--- a/build/jakarta-poi/docs/index.html
+++ b/build/jakarta-poi/docs/index.html
@@ -106,7 +106,7 @@
 <a href="contrib.html"><font size="-1">Contributing</font></a>
 </li>
 <li>
-<a href="https://sourceforge.net/tracker/?atid=406288&group_id=32701&func=browse"><font size="-1">Bug Database</font></a>
+<a href="http://nagoya.apache.org/bugzilla/buglist.cgi?product=POI"><font size="-1">Bug Database</font></a>
 </li>
 <li>
 <a href="http://jakarta.apache.org/site/cvsindex.html"><font size="-1">CVS</font></a>
diff --git a/build/jakarta-poi/docs/livesites.html b/build/jakarta-poi/docs/livesites.html
index 8ce939c53e..7795ca83b6 100644
--- a/build/jakarta-poi/docs/livesites.html
+++ b/build/jakarta-poi/docs/livesites.html
@@ -106,7 +106,7 @@
 <a href="contrib.html"><font size="-1">Contributing</font></a>
 </li>
 <li>
-<a href="https://sourceforge.net/tracker/?atid=406288&group_id=32701&func=browse"><font size="-1">Bug Database</font></a>
+<a href="http://nagoya.apache.org/bugzilla/buglist.cgi?product=POI"><font size="-1">Bug Database</font></a>
 </li>
 <li>
 <a href="http://jakarta.apache.org/site/cvsindex.html"><font size="-1">CVS</font></a>
diff --git a/build/jakarta-poi/docs/mail-archives.html b/build/jakarta-poi/docs/mail-archives.html
index d12d6626c2..1656f6b662 100644
--- a/build/jakarta-poi/docs/mail-archives.html
+++ b/build/jakarta-poi/docs/mail-archives.html
@@ -106,7 +106,7 @@
 <a href="contrib.html"><font size="-1">Contributing</font></a>
 </li>
 <li>
-<a href="https://sourceforge.net/tracker/?atid=406288&group_id=32701&func=browse"><font size="-1">Bug Database</font></a>
+<a href="http://nagoya.apache.org/bugzilla/buglist.cgi?product=POI"><font size="-1">Bug Database</font></a>
 </li>
 <li>
 <a href="http://jakarta.apache.org/site/cvsindex.html"><font size="-1">CVS</font></a>
diff --git a/build/jakarta-poi/docs/mail-lists.html b/build/jakarta-poi/docs/mail-lists.html
index 079ca3123d..0fbd9cdf89 100644
--- a/build/jakarta-poi/docs/mail-lists.html
+++ b/build/jakarta-poi/docs/mail-lists.html
@@ -106,7 +106,7 @@
 <a href="contrib.html"><font size="-1">Contributing</font></a>
 </li>
 <li>
-<a href="https://sourceforge.net/tracker/?atid=406288&group_id=32701&func=browse"><font size="-1">Bug Database</font></a>
+<a href="http://nagoya.apache.org/bugzilla/buglist.cgi?product=POI"><font size="-1">Bug Database</font></a>
 </li>
 <li>
 <a href="http://jakarta.apache.org/site/cvsindex.html"><font size="-1">CVS</font></a>
diff --git a/build/jakarta-poi/docs/overview.html b/build/jakarta-poi/docs/overview.html
index 409b10c09b..4620e7cf4a 100644
--- a/build/jakarta-poi/docs/overview.html
+++ b/build/jakarta-poi/docs/overview.html
@@ -106,7 +106,7 @@
 <a href="contrib.html"><font size="-1">Contributing</font></a>
 </li>
 <li>
-<a href="https://sourceforge.net/tracker/?atid=406288&group_id=32701&func=browse"><font size="-1">Bug Database</font></a>
+<a href="http://nagoya.apache.org/bugzilla/buglist.cgi?product=POI"><font size="-1">Bug Database</font></a>
 </li>
 <li>
 <a href="http://jakarta.apache.org/site/cvsindex.html"><font size="-1">CVS</font></a>
diff --git a/build/jakarta-poi/docs/todo.html b/build/jakarta-poi/docs/todo.html
index f1a3fd6f00..1efc8be2c5 100644
--- a/build/jakarta-poi/docs/todo.html
+++ b/build/jakarta-poi/docs/todo.html
@@ -106,7 +106,7 @@
 <a href="contrib.html"><font size="-1">Contributing</font></a>
 </li>
 <li>
-<a href="https://sourceforge.net/tracker/?atid=406288&group_id=32701&func=browse"><font size="-1">Bug Database</font></a>
+<a href="http://nagoya.apache.org/bugzilla/buglist.cgi?product=POI"><font size="-1">Bug Database</font></a>
 </li>
 <li>
 <a href="http://jakarta.apache.org/site/cvsindex.html"><font size="-1">CVS</font></a>
diff --git a/build/jakarta-poi/docs/who.html b/build/jakarta-poi/docs/who.html
index 4d86777acd..ef156e0177 100644
--- a/build/jakarta-poi/docs/who.html
+++ b/build/jakarta-poi/docs/who.html
@@ -106,7 +106,7 @@
 <a href="contrib.html"><font size="-1">Contributing</font></a>
 </li>
 <li>
-<a href="https://sourceforge.net/tracker/?atid=406288&group_id=32701&func=browse"><font size="-1">Bug Database</font></a>
+<a href="http://nagoya.apache.org/bugzilla/buglist.cgi?product=POI"><font size="-1">Bug Database</font></a>
 </li>
 <li>
 <a href="http://jakarta.apache.org/site/cvsindex.html"><font size="-1">CVS</font></a>
@@ -208,6 +208,8 @@
 <a href="http://www.marcj.com">Marc Johnson</a> (mjohnson at apache dot org)</li>
       
 <li>Glen Stampoultzis (glens at apache.org)</li>
+      
+<li>Rainer Klute (klute at rainer-klute dot de)</li>      
     
 </ul>
   
@@ -230,8 +232,6 @@
       
 <li>Nicola Ken Barozzi (barozzi at nicolaken dot com)</li>
       
-<li>Rainer Klute (klute at rainer-klute dot de)</li>
-      
 <li>Ryan Ackley (sackley at cfl dot rr dot com)</li>
     
 </ul>
diff --git a/src/documentation/xdocs/book.xml b/src/documentation/xdocs/book.xml
index cff2077fcc..8782bc2d4b 100644
--- a/src/documentation/xdocs/book.xml
+++ b/src/documentation/xdocs/book.xml
@@ -40,7 +40,7 @@
 
   <menu label="Get Involved">
     <menu-item label="Contributing" href="contrib.html"/>
-    <menu-item label="Bug Database" href="https://sourceforge.net/tracker/?atid=406288&amp;group_id=32701&amp;func=browse"/>
+    <menu-item label="Bug Database" href="http://nagoya.apache.org/bugzilla/buglist.cgi?product=POI"/>
     <menu-item label="CVS" href="http://jakarta.apache.org/site/cvsindex.html"/>
     <menu-item label="Mail Lists" href="http://jakarta.apache.org/site/mail.html"/>
   </menu>
diff --git a/src/documentation/xdocs/who.xml b/src/documentation/xdocs/who.xml
index 80df6543ad..6d147df13e 100644
--- a/src/documentation/xdocs/who.xml
+++ b/src/documentation/xdocs/who.xml
@@ -43,12 +43,13 @@
       <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>Glen Stampoultzis (glens at apache.org)</li>
+      <li>Rainer Klute (klute at rainer-klute dot de)</li>      
     </ul>
   </s2>
   <s2 title="Developers">
     <ul>
       <li>Nicola Ken Barozzi (barozzi at nicolaken dot com)</li>
-      <li>Rainer Klute (klute at rainer-klute dot de)</li>
+      <li>Ryan Ackley (sackley at cfl dot rr dot com)</li>
     </ul>
   </s2>
  </s1>