diff --git a/src/site/site.xml b/src/site/site.xml
index e45be1b0..3f5a49e4 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -5,7 +5,7 @@
     <menu name="Commons CSV">
       <item name="Overview"    href="/index.html"/>
       <item name="Download"    href="/downloads.html"/>
-      <item name="Wiki"        href="http://wiki.apache.org/jakarta-commons/CSV"/>
+      <item name="Wiki"        href="http://wiki.apache.org/commons/CSV"/>
     </menu>
     
     <menu name="Development">
diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml
index f95fce0f..d1b7c4f6 100644
--- a/src/site/xdoc/index.xml
+++ b/src/site/xdoc/index.xml
@@ -37,8 +37,8 @@ limitations under the License.
 </section>
 
 <section name="Getting the code?">
-  <p>There are currently no official downloads, and will not be until CSV moves out of the Sandbox, but a nightly build is available from <a href="http://people.apache.org/builds/jakarta-commons/nightly/commons-csv/">http://people.apache.org/builds/jakarta-commons/nightly/commons-csv/</a>. </p>
-  <p>The latest code may be checked out from the following url - <a href="http://svn.apache.org/repos/asf/jakarta/commons/sandbox/csv/trunk/">http://svn.apache.org/repos/asf/jakarta/commons/sandbox/csv/trunk/</a>. </p>
+  <p>There are currently no official downloads, and will not be until CSV moves out of the Sandbox, but a nightly build is available from <a href="http://people.apache.org/builds/commons/nightly/commons-csv/">http://people.apache.org/builds/commons/nightly/commons-csv/</a>. </p>
+  <p>The latest code may be checked out from the following url - <a href="http://svn.apache.org/repos/asf/commons/sandbox/csv/trunk/">http://svn.apache.org/repos/asf/commons/sandbox/csv/trunk/</a>. </p>
 </section>
 
 <section name="Bugs?">
diff --git a/src/site/xdoc/issue-tracking.xml b/src/site/xdoc/issue-tracking.xml
index 29797db4..2f737c2a 100644
--- a/src/site/xdoc/issue-tracking.xml
+++ b/src/site/xdoc/issue-tracking.xml
@@ -40,7 +40,7 @@ limitations under the License.
 <ol>
   <li><a href="http://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;pid=12310491&amp;component=12311182&amp;sorter/field=issuekey&amp;sorter/order=DESC&amp;status=1&amp;status=4">Search existing open bugs</a>.
   If you find your issue listed then please add a comment with your details.</li>
-  <li><a href="http://mail-archives.apache.org/mod_mbox/jakarta-commons-dev/">Search the mailing list archive</a>.
+  <li><a href="http://mail-archives.apache.org/mod_mbox/commons-dev/">Search the mailing list archive</a>.
   You may find your issue or idea has already been discussed.</li>
   <li>Decide if your issue is a bug or an enhancement.</li>
   <li>Submit either a <a href="http://issues.apache.org/jira/secure/CreateIssueDetails!init.jspa?pid=12310491&amp;component=12311182&amp;issuetype=1&amp;priority=4&amp;assignee=-1">bug report</a>