diff --git a/artifact/src/main/org/apache/maven/deploy/deployers/FtpDeployer.java b/artifact/src/main/org/apache/maven/deploy/deployers/FtpDeployer.java
index e3b37e04..2f409272 100644
--- a/artifact/src/main/org/apache/maven/deploy/deployers/FtpDeployer.java
+++ b/artifact/src/main/org/apache/maven/deploy/deployers/FtpDeployer.java
@@ -38,11 +38,11 @@ import org.apache.maven.deploy.exceptions.TransferFailedException;
  * An FTP deployer based on the FTPClient in the Commons Net package.
  *
  * Proxy server for FTPClient is not supported:
- * {@link http://nagoya.apache.org/bugzilla/show_bug.cgi?id=18039}
+ * {@link http://issues.apache.org/bugzilla/show_bug.cgi?id=18039}
  * 
  * @author <a href="mailto:jason@zenplex.com">Jason van Zyl</a>
  * @author <a href="mailto:michal.maczka@dimatics.com">Michal Maczka</a>
- * @version $Id: FtpDeployer.java,v 1.14 2004/09/29 10:56:04 brett Exp $
+ * @version $Id$
  * 
  * @todo review exception handling
  * @todo don't spool to System.out
diff --git a/changes/plugin.properties b/changes/plugin.properties
index 6d79e091..ab0f31e4 100644
--- a/changes/plugin.properties
+++ b/changes/plugin.properties
@@ -30,7 +30,7 @@
 maven.changes.issue.template = %URL%/%ISSUE%
 
 # For Bugzilla, assuming the issueTrackingUrl points to something like
-# http://nagoya.apache.org/bugzilla/
+# http://issues.apache.org/bugzilla/
 # maven.changes.issue.template = %URL%/show_bug.cgi?id=%ISSUE%
 
 # For Sourceforge, use the "aid" parameter. For example:
diff --git a/examples/exampleejb-1.0/project.xml b/examples/exampleejb-1.0/project.xml
index 4021969a..23e5c37e 100644
--- a/examples/exampleejb-1.0/project.xml
+++ b/examples/exampleejb-1.0/project.xml
@@ -40,7 +40,7 @@
 
   <url>http://maven.apache.org/</url>
   <cvsWebUrl>http://cvs.apache.org/viewcvs/maven/</cvsWebUrl>
-  <issueTrackingUrl>http://nagoya.apache.org/scarab/servlet/scarab/</issueTrackingUrl>
+  <issueTrackingUrl>http://issues.apache.org/scarab/servlet/scarab/</issueTrackingUrl>
   <siteAddress>jakarta.apache.org</siteAddress>
   <siteDirectory>/www/maven.apache.org/</siteDirectory>
   <distributionDirectory>/www/maven.apache.org/builds/</distributionDirectory>
diff --git a/genapp/src/plugin-resources/complex/template-resources/project.xml b/genapp/src/plugin-resources/complex/template-resources/project.xml
index da23f6aa..19f19e6c 100644
--- a/genapp/src/plugin-resources/complex/template-resources/project.xml
+++ b/genapp/src/plugin-resources/complex/template-resources/project.xml
@@ -35,7 +35,7 @@
   <!-- the project home page -->
   <url>http://maven.apache.org/reference/plugins/examples/</url>
 
-  <issueTrackingUrl>http://nagoya.apache.org/scarab/servlet/scarab/</issueTrackingUrl>
+  <issueTrackingUrl>http://issues.apache.org/scarab/servlet/scarab/</issueTrackingUrl>
   <siteAddress>jakarta.apache.org</siteAddress>
   <siteDirectory>/www/maven.apache.org/reference/plugins/examples/</siteDirectory>
   <distributionDirectory>/www/maven.apache.org/builds/</distributionDirectory>
diff --git a/genapp/src/plugin-resources/default/template-resources/project.xml b/genapp/src/plugin-resources/default/template-resources/project.xml
index 30d18391..7f161c13 100644
--- a/genapp/src/plugin-resources/default/template-resources/project.xml
+++ b/genapp/src/plugin-resources/default/template-resources/project.xml
@@ -51,7 +51,7 @@
   <!-- the project home page -->
 
   <url>http://maven.apache.org/reference/plugins/examples/</url>
-  <issueTrackingUrl>http://nagoya.apache.org/scarab/servlet/scarab/</issueTrackingUrl>
+  <issueTrackingUrl>http://issues.apache.org/scarab/servlet/scarab/</issueTrackingUrl>
   <siteAddress>jakarta.apache.org</siteAddress>
   <siteDirectory>/www/maven.apache.org/reference/plugins/examples/</siteDirectory>
   <distributionDirectory>/www/maven.apache.org/builds/</distributionDirectory>
diff --git a/genapp/src/plugin-resources/ejb/template-resources/project.xml b/genapp/src/plugin-resources/ejb/template-resources/project.xml
index 23195ec3..14f4f92a 100644
--- a/genapp/src/plugin-resources/ejb/template-resources/project.xml
+++ b/genapp/src/plugin-resources/ejb/template-resources/project.xml
@@ -52,7 +52,7 @@
   <!-- the project home page -->
 
   <url>http://maven.apache.org/reference/plugins/examples/</url>
-  <issueTrackingUrl>http://nagoya.apache.org/scarab/servlet/scarab/</issueTrackingUrl>
+  <issueTrackingUrl>http://issues.apache.org/scarab/servlet/scarab/</issueTrackingUrl>
   <siteAddress>jakarta.apache.org</siteAddress>
   <siteDirectory>/www/maven.apache.org/reference/plugins/examples/</siteDirectory>
   <distributionDirectory>/www/maven.apache.org/builds/</distributionDirectory>
diff --git a/genapp/src/plugin-resources/struts-jstl/template-resources/project.xml b/genapp/src/plugin-resources/struts-jstl/template-resources/project.xml
index 74f47d1a..bd4b48fb 100644
--- a/genapp/src/plugin-resources/struts-jstl/template-resources/project.xml
+++ b/genapp/src/plugin-resources/struts-jstl/template-resources/project.xml
@@ -52,7 +52,7 @@
   <!-- the project home page -->
 
   <url>http://maven.apache.org/reference/plugins/examples/</url>
-  <issueTrackingUrl>http://nagoya.apache.org/scarab/servlet/scarab/</issueTrackingUrl>
+  <issueTrackingUrl>http://issues.apache.org/scarab/servlet/scarab/</issueTrackingUrl>
   <siteAddress>jakarta.apache.org</siteAddress>
   <siteDirectory>/www/maven.apache.org/reference/plugins/examples/</siteDirectory>
   <distributionDirectory>/www/maven.apache.org/builds/</distributionDirectory>
diff --git a/genapp/src/plugin-resources/struts/template-resources/project.xml b/genapp/src/plugin-resources/struts/template-resources/project.xml
index bc092062..f1f9a8a5 100644
--- a/genapp/src/plugin-resources/struts/template-resources/project.xml
+++ b/genapp/src/plugin-resources/struts/template-resources/project.xml
@@ -52,7 +52,7 @@
   <!-- the project home page -->
 
   <url>http://maven.apache.org/reference/plugins/examples/</url>
-  <issueTrackingUrl>http://nagoya.apache.org/scarab/servlet/scarab/</issueTrackingUrl>
+  <issueTrackingUrl>http://issues.apache.org/scarab/servlet/scarab/</issueTrackingUrl>
   <siteAddress>jakarta.apache.org</siteAddress>
   <siteDirectory>/www/maven.apache.org/reference/plugins/examples/</siteDirectory>
   <distributionDirectory>/www/maven.apache.org/builds/</distributionDirectory>
diff --git a/genapp/src/plugin-resources/web-jstl/template-resources/project.xml b/genapp/src/plugin-resources/web-jstl/template-resources/project.xml
index 1a94924d..7be2081b 100644
--- a/genapp/src/plugin-resources/web-jstl/template-resources/project.xml
+++ b/genapp/src/plugin-resources/web-jstl/template-resources/project.xml
@@ -52,7 +52,7 @@
   <!-- the project home page -->
 
   <url>http://maven.apache.org/reference/plugins/examples/</url>
-  <issueTrackingUrl>http://nagoya.apache.org/scarab/servlet/scarab/</issueTrackingUrl>
+  <issueTrackingUrl>http://issues.apache.org/scarab/servlet/scarab/</issueTrackingUrl>
   <siteAddress>jakarta.apache.org</siteAddress>
   <siteDirectory>/www/maven.apache.org/reference/plugins/examples/</siteDirectory>
   <distributionDirectory>/www/maven.apache.org/builds/</distributionDirectory>
diff --git a/genapp/src/plugin-resources/web-velocity/template-resources/project.xml b/genapp/src/plugin-resources/web-velocity/template-resources/project.xml
index d95cea74..f3f7addb 100644
--- a/genapp/src/plugin-resources/web-velocity/template-resources/project.xml
+++ b/genapp/src/plugin-resources/web-velocity/template-resources/project.xml
@@ -52,7 +52,7 @@
   <!-- the project home page -->
 
   <url>http://maven.apache.org/reference/plugins/examples/</url>
-  <issueTrackingUrl>http://nagoya.apache.org/scarab/servlet/scarab/</issueTrackingUrl>
+  <issueTrackingUrl>http://issues.apache.org/scarab/servlet/scarab/</issueTrackingUrl>
   <siteAddress>jakarta.apache.org</siteAddress>
   <siteDirectory>/www/maven.apache.org/reference/plugins/examples/</siteDirectory>
   <distributionDirectory>/www/maven.apache.org/builds/</distributionDirectory>
diff --git a/genapp/src/plugin-resources/web/template-resources/project.xml b/genapp/src/plugin-resources/web/template-resources/project.xml
index 22b6d0e9..1632e9c5 100644
--- a/genapp/src/plugin-resources/web/template-resources/project.xml
+++ b/genapp/src/plugin-resources/web/template-resources/project.xml
@@ -52,7 +52,7 @@
   <!-- the project home page -->
 
   <url>http://maven.apache.org/reference/plugins/examples/</url>
-  <issueTrackingUrl>http://nagoya.apache.org/scarab/servlet/scarab/</issueTrackingUrl>
+  <issueTrackingUrl>http://issues.apache.org/scarab/servlet/scarab/</issueTrackingUrl>
   <siteAddress>jakarta.apache.org</siteAddress>
   <siteDirectory>/www/maven.apache.org/reference/plugins/examples/</siteDirectory>
   <distributionDirectory>/www/maven.apache.org/builds/</distributionDirectory>
diff --git a/plugin-parent/project.xml b/plugin-parent/project.xml
index 8b1e5f33..6aa851a2 100644
--- a/plugin-parent/project.xml
+++ b/plugin-parent/project.xml
@@ -46,13 +46,13 @@
       <name>Maven User List</name>
       <subscribe>users-subscribe@maven.apache.org</subscribe>
       <unsubscribe>users-unsubscribe@maven.apache.org</unsubscribe>
-      <archive>http://nagoya.apache.org/eyebrowse/SummarizeList?listName=users@maven.apache.org</archive>
+      <archive>http://mail-archives.apache.org/eyebrowse/SummarizeList?listName=users@maven.apache.org</archive>
     </mailingList>
     <mailingList>
       <name>Maven Developer List</name>
       <subscribe>dev-subscribe@maven.apache.org</subscribe>
       <unsubscribe>dev-unsubscribe@maven.apache.org</unsubscribe>
-      <archive>http://nagoya.apache.org/eyebrowse/SummarizeList?listName=dev@maven.apache.org</archive>
+      <archive>http://mail-archives.apache.org/eyebrowse/SummarizeList?listName=dev@maven.apache.org</archive>
     </mailingList>
   </mailingLists>
 
diff --git a/project.xml b/project.xml
index 4d0d4ad1..adbbc487 100644
--- a/project.xml
+++ b/project.xml
@@ -44,13 +44,13 @@
       <name>Maven User List</name>
       <subscribe>users-subscribe@maven.apache.org</subscribe>
       <unsubscribe>users-unsubscribe@maven.apache.org</unsubscribe>
-      <archive>http://nagoya.apache.org/eyebrowse/SummarizeList?listName=users@maven.apache.org</archive>
+      <archive>http://mail-archives.apache.org/eyebrowse/SummarizeList?listName=users@maven.apache.org</archive>
     </mailingList>
     <mailingList>
       <name>Maven Developer List</name>
       <subscribe>dev-subscribe@maven.apache.org</subscribe>
       <unsubscribe>dev-unsubscribe@maven.apache.org</unsubscribe>
-      <archive>http://nagoya.apache.org/eyebrowse/SummarizeList?listName=dev@maven.apache.org</archive>
+      <archive>http://mail-archives.apache.org/eyebrowse/SummarizeList?listName=dev@maven.apache.org</archive>
     </mailingList>
   </mailingLists>