diff --git a/src/documentation/xdocs/changes.xml b/src/documentation/xdocs/changes.xml
index 504564d78..1962c9b85 100644
--- a/src/documentation/xdocs/changes.xml
+++ b/src/documentation/xdocs/changes.xml
@@ -10,7 +10,7 @@
   <person id="GS"  name="Glen Stampoultzis"  email="gstamp@iprimus.com.au"/>  
   <person id="MJ"  name="Marc Johnson"       email="mjohnson@apache.org"/>
   <person id="NKB" name="Nicola Ken Barozzi" email="barozzi@nicolaken.com"/>
-  <person id="open" name="Poi Developers"    email="poi-devel@lists.sourceforge.net"/>
+  <person id="open" name="Poi Developers"    email="poi-dev@jakarta.apache.org"/>
  </devs>
  <release version="@version@" date="@date@">
   <action dev="NKB" type="update">
diff --git a/src/documentation/xdocs/mail-archives.xml b/src/documentation/xdocs/mail-archives.xml
index 29ce8edbd..f68cfc638 100644
--- a/src/documentation/xdocs/mail-archives.xml
+++ b/src/documentation/xdocs/mail-archives.xml
@@ -19,33 +19,23 @@
 
   <table>
    <tr>
-    <td><strong>Poi-general-user</strong></td>
-    <td><strong>Poi-devel</strong></td>
+    <td><strong>poi-user</strong></td>
+    <td><strong>poi-dev</strong></td>
     <td><strong>Regularly updated?</strong></td>
     <td><strong>Searchable?</strong></td>
     <td><strong>Speed</strong></td>
     <td><strong>Other features?</strong></td>
    </tr>
    <tr>
-    <td><link href="http://sourceforge.net/mailarchive/forum.php?forum_id=2802">
-    Sourceforge</link></td>
-    <td><link href="http://sourceforge.net/mailarchive/forum.php?forum_id=4380">
-    Sourceforge</link></td>
+    <td><link href="http://www.mail-archive.com/poi-user@jakarta.apache.org">
+    Apache</link></td>
+    <td><link href="http://www.mail-archive.com/poi-dev@jakarta.apache.org">
+    Apache</link></td>
     <td>Yes</td>
-    <td>Onsite, by subject/author/body</td>
-    <td>4/5</td>
-    <td>all Sourceforge features</td>
+    <td>?</td>
+    <td>?</td>
+    <td>?</td>
    </tr>
-   <tr>
-    <td><link href="http://www.geocrawler.com/redir-sf.php3?list=poi-general-user">
-    GeoCrawler</link></td>
-    <td><link href="http://www.geocrawler.com/redir-sf.php3?list=poi-devel">
-    GeoCrawler</link></td>
-    <td>?</td>
-    <td>?</td>
-    <td>?</td>
-    <td>?</td>
-   </tr>   
   </table>
  </s1>
 
diff --git a/src/documentation/xdocs/mail-lists.xml b/src/documentation/xdocs/mail-lists.xml
index eaf9a0c34..55a1ce529 100644
--- a/src/documentation/xdocs/mail-lists.xml
+++ b/src/documentation/xdocs/mail-lists.xml
@@ -29,8 +29,8 @@
   </s1>
 
   <s1 title="Poi Users">
-   <p><link href="http://lists.sourceforge.net/lists/listinfo/poi-general-user">Subscribe</link>
-      <link href="http://lists.sourceforge.net/lists/listinfo/poi-general-user">Unsubscribe</link>
+   <p><link href="mailto://poi-user-subscribe@jakarta.apache.org">Subscribe</link>
+      <link href="mailto://poi-user-unsubscribe@jakarta.apache.org">Unsubscribe</link>
    </p>
 
    <p>The general list, for problems, bug reports, asking for advice on how
@@ -65,8 +65,8 @@
   </s1>
 
   <s1 title="Poi Dev">
-   <p><link href="http://lists.sourceforge.net/lists/listinfo/poi-devel">Subscribe</link>
-      <link href="http://lists.sourceforge.net/lists/listinfo/poi-devel">Unsubscribe</link>
+   <p><link href="mailto://poi-dev-subscribe@jakarta.apache.org">Subscribe</link>
+      <link href="mailto://poi-dev-unsubscribe@jakarta.apache.org">Unsubscribe</link>
    </p>
 
    <p>This list is for developers <strong>working on</strong> or wanting to work on
diff --git a/src/documentation/xdocs/todo.xml b/src/documentation/xdocs/todo.xml
index 24804606f..aa30377ff 100644
--- a/src/documentation/xdocs/todo.xml
+++ b/src/documentation/xdocs/todo.xml
@@ -10,7 +10,7 @@
   <person id="GS"  name="Glen Stampoultzis"  email="gstamp@iprimus.com.au"/>  
   <person id="MJ"  name="Marc Johnson"       email="mjohnson at apache dot org"/>
   <person id="NKB" name="Nicola Ken Barozzi" email="barozzi@nicolaken.com"/>
-  <person id="open" name="Poi Developers"    email="poi-devel@lists.sourceforge.net"/>
+  <person id="open" name="Poi Developers"    email="poi-dev@jakarta.apache.org"/>
  </devs>
 
  <actions priority="high">