diff --git a/src/documentation/content/xdocs/site.xml b/src/documentation/content/xdocs/site.xml
index 5f36715..c7b25f4 100644
--- a/src/documentation/content/xdocs/site.xml
+++ b/src/documentation/content/xdocs/site.xml
@@ -48,7 +48,7 @@
     <cvs label="CVS" href="http://cvs.apache.org/viewcvs/xml-commons/"/>
     <mail-lists label="Mail lists" href="index.html#mailing"/>
     <mail-archives label="Mail Archives" href="http://marc.theaimsgroup.com/?l=xml-commons-dev"/>
-    <issues label="Bugs and Issues" href="http://nagoya.apache.org/bugzilla/"/>
+    <issues label="Bugs and Issues" href="http://issues.apache.org/bugzilla/"/>
     <howto-forrest label="How-to Forrest" href="howto-forrest.html"/>
   </getting-involved>
 
diff --git a/status.xml b/status.xml
index 037282f..612413c 100644
--- a/status.xml
+++ b/status.xml
@@ -38,7 +38,7 @@
       </action>
       <action context="code" dev="neilg">
         Update versions of external DOM/SAX/JAXP code to best-possible that still passes TCK-JAXP-1.2.
-        <link href="http://nagoya.apache.org/eyebrowse/ReadMsg?listName=commons-dev@xml.apache.org&amp;msgNo=39">making TCK-compliant API's common</link>
+        <link href="http://issues.apache.org/eyebrowse/ReadMsg?listName=commons-dev@xml.apache.org&amp;msgNo=39">making TCK-compliant API's common</link>
         (Actually is neilg,ilene)
       </action>
       <action context="build" dev="open">
@@ -99,7 +99,7 @@
       <action type="add" context="docs" dev="crossley"
         due-to="Nicola Ken Barozzi" due-to-email="nicolaken@apache.org">
         Added the brilliant 
-        <link href="http://nagoya.apache.org/eyebrowse/BrowseList?listName=commons-dev@xml.apache.org&amp;by=thread&amp;from=320776">xml-commons logo</link>.
+        <link href="http://issues.apache.org/eyebrowse/BrowseList?listName=commons-dev@xml.apache.org&amp;by=thread&amp;from=320776">xml-commons logo</link>.
       </action>
       <action type="add" context="build" dev="crossley">
         Added xml-commons/readme-build.txt to start to explain the build system.