diff --git a/abbot/project.xml b/abbot/project.xml
index 71df3d49..7d5db56e 100644
--- a/abbot/project.xml
+++ b/abbot/project.xml
@@ -27,7 +27,7 @@
   <description>Run Abbot tests</description>
   <shortDescription>Abbot Tests</shortDescription>
   <url>http://maven.apache.org/reference/plugins/abbot/</url>
-  <issueTrackingUrl>http://jira.codehaus.org/secure/BrowseProject.jspa?id=10550</issueTrackingUrl>
+  <issueTrackingUrl>http://jira.codehaus.org/browse/MPABBOT</issueTrackingUrl>
   <siteDirectory>/www/maven.apache.org/reference/plugins/abbot/</siteDirectory>
   <repository>
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/abbot/</connection>
@@ -170,4 +170,4 @@
     <report>maven-license-plugin</report>
     <report>maven-linkcheck-plugin</report>
   </reports>
-</project>
\ No newline at end of file
+</project>
diff --git a/announcement/project.xml b/announcement/project.xml
index 0f4e4738..4344e496 100644
--- a/announcement/project.xml
+++ b/announcement/project.xml
@@ -27,7 +27,7 @@
   <description>The Announcement plugin generates release announcements. It uses the information found in both the POM and in the changes.xml file to generate the announcement text.</description>&gt;
   <shortDescription>Produce release announcement</shortDescription>
   <url>http://maven.apache.org/reference/plugins/announcement/</url>
-  <issueTrackingUrl>http://jira.codehaus.org/BrowseProject.jspa?id=10470</issueTrackingUrl>
+  <issueTrackingUrl>http://jira.codehaus.org/browse/MPANNOUNCEMENT</issueTrackingUrl>
   <siteDirectory>/www/maven.apache.org/reference/plugins/announcement/</siteDirectory>
   <repository>
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/announcement/</connection>
diff --git a/ant/project.xml b/ant/project.xml
index eb438cf8..6655d24d 100644
--- a/ant/project.xml
+++ b/ant/project.xml
@@ -27,7 +27,7 @@
   <description>Generates ant build files from a maven project, so that plain ant users can build your project</description>
   <shortDescription>Generate Ant build file</shortDescription>
   <url>http://maven.apache.org/reference/plugins/ant/</url>
-  <issueTrackingUrl>http://jira.codehaus.org/BrowseProject.jspa?id=10316</issueTrackingUrl>
+  <issueTrackingUrl>http://jira.codehaus.org/browse/MPANT</issueTrackingUrl>
   <siteDirectory>/www/maven.apache.org/reference/plugins/ant/</siteDirectory>
   <repository>
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/ant/</connection>
diff --git a/antlr/project.xml b/antlr/project.xml
index 43a58ad3..a8abc926 100644
--- a/antlr/project.xml
+++ b/antlr/project.xml
@@ -27,7 +27,7 @@
   <description/>
   <shortDescription>Process Antlr grammars</shortDescription>
   <url>http://maven.apache.org/reference/plugins/antlr/</url>
-  <issueTrackingUrl>http://jira.codehaus.org/BrowseProject.jspa?id=10318</issueTrackingUrl>
+  <issueTrackingUrl>http://jira.codehaus.org/browse/MPANTLR</issueTrackingUrl>
   <siteDirectory>/www/maven.apache.org/reference/plugins/antlr/</siteDirectory>
   <repository>
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/antlr/</connection>
diff --git a/appserver/project.xml b/appserver/project.xml
index 89d93c5a..dccaf342 100644
--- a/appserver/project.xml
+++ b/appserver/project.xml
@@ -28,7 +28,7 @@
   <shortDescription>A Maven plugin that can be used to install and control a J2EE application server instance.</shortDescription>
   <url>http://maven.apache.org/reference/plugins/appserver/</url>
   <siteDirectory>/www/maven.apache.org/reference/plugins/appserver/</siteDirectory>
-  <issueTrackingUrl>http://jira.codehaus.org/BrowseProject.jspa?id=10370</issueTrackingUrl>
+  <issueTrackingUrl>http://jira.codehaus.org/browse/MPAPPSERVER</issueTrackingUrl>
   <repository>
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/appserver/</connection>
     <developerConnection>scm:cvs:ext:${maven.username}@cvs.apache.org:/home/cvs:maven-plugins/appserver/</developerConnection>
diff --git a/artifact/project.xml b/artifact/project.xml
index f0cfaed3..5b52082e 100644
--- a/artifact/project.xml
+++ b/artifact/project.xml
@@ -28,7 +28,7 @@
   <description/>
   <shortDescription>Tools to manage artifacts and deployment</shortDescription>
   <url>http://maven.apache.org/reference/plugins/artifact/</url>
-  <issueTrackingUrl>http://jira.codehaus.org/BrowseProject.jspa?id=10319</issueTrackingUrl>
+  <issueTrackingUrl>http://jira.codehaus.org/browse/MPARTIFACT</issueTrackingUrl>
   <siteDirectory>/www/maven.apache.org/reference/plugins/artifact/</siteDirectory>
   <repository>
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/artifact/</connection>
diff --git a/ashkelon/project.xml b/ashkelon/project.xml
index 30e9fd10..d8128799 100644
--- a/ashkelon/project.xml
+++ b/ashkelon/project.xml
@@ -28,6 +28,7 @@
   <shortDescription>Publish javadoc to Ashkelon</shortDescription>
   <url>http://maven.apache.org/reference/plugins/ashkelon/</url>
   <package>org.apache.maven.ashkelon</package>
+  <issueTrackingUrl>http://jira.codehaus.org/browse/MPASHKELON</issueTrackingUrl>
   <siteDirectory>/www/maven.apache.org/reference/plugins/ashkelon/</siteDirectory>
   <repository>
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/ashkelon/</connection>
diff --git a/aspectj/project.xml b/aspectj/project.xml
index d9c7c531..f0c9759d 100644
--- a/aspectj/project.xml
+++ b/aspectj/project.xml
@@ -28,6 +28,7 @@
   <shortDescription>AspectJ Plugin for Maven</shortDescription>
   <url>http://maven.apache.org/reference/plugins/aspectj/</url>
   <issueTrackingUrl>http://jira.codehaus.org/BrowseProject.jspa?id=10320</issueTrackingUrl>
+  <issueTrackingUrl>http://jira.codehaus.org/browse/MPASPECTJ</issueTrackingUrl>
   <siteDirectory>/www/maven.apache.org/reference/plugins/aspectj/</siteDirectory>
   <repository>
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/aspectj/</connection>
diff --git a/aspectwerkz/project.xml b/aspectwerkz/project.xml
index e841d2d9..652fc6dc 100644
--- a/aspectwerkz/project.xml
+++ b/aspectwerkz/project.xml
@@ -27,7 +27,7 @@
   <description>Plugin for AspectWerkz</description>
   <shortDescription>AspectWerkz plugin</shortDescription>
   <url>http://maven.apache.org/reference/plugins/aspectwerkz/</url>
-  <issueTrackingUrl>http://jira.codehaus.org/BrowseProject.jspa?id=10391</issueTrackingUrl>
+  <issueTrackingUrl>http://jira.codehaus.org/browse/MPASPECTWERKZ</issueTrackingUrl>
   <siteDirectory>/www/maven.apache.org/reference/plugins/aspectwerkz/</siteDirectory>
   <repository>
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/aspectwerkz/</connection>
diff --git a/caller/project.xml b/caller/project.xml
index 8aaf1dfb..480e3284 100644
--- a/caller/project.xml
+++ b/caller/project.xml
@@ -27,7 +27,7 @@
   <description>Interface to isolate calls between plugins</description>
   <shortDescription>Maven Caller plugin</shortDescription>
   <url>http://maven.apache.org/reference/plugins/caller/</url>
-  <issueTrackingUrl>http://jira.codehaus.org/BrowseProject.jspa?id=10317</issueTrackingUrl>
+  <issueTrackingUrl>http://jira.codehaus.org/browse/MPCALLER</issueTrackingUrl>
   <siteDirectory>/www/maven.apache.org/reference/plugins/caller/</siteDirectory>
   <repository>
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/caller/</connection>
diff --git a/castor/project.xml b/castor/project.xml
index e98bdb83..5f6fe618 100644
--- a/castor/project.xml
+++ b/castor/project.xml
@@ -27,7 +27,7 @@
   <description>Various goals for making development with Plexus easy.</description>
   <shortDescription>Plexus Tools</shortDescription>
   <url>http://maven.apache.org/reference/plugins/castor/</url>
-  <issueTrackingUrl>http://jira.codehaus.org/BrowseProject.jspa?id=10338</issueTrackingUrl>
+  <issueTrackingUrl>http://jira.codehaus.org/browse/MPCASTOR</issueTrackingUrl>
   <siteDirectory>/www/maven.apache.org/reference/plugins/castor/</siteDirectory>
   <repository>
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/castor/</connection>
diff --git a/changelog/project.xml b/changelog/project.xml
index 04769673..ed32d36e 100644
--- a/changelog/project.xml
+++ b/changelog/project.xml
@@ -27,7 +27,7 @@
   <description/>
   <shortDescription>Produce SCM changelog reports</shortDescription>
   <url>http://maven.apache.org/reference/plugins/changelog/</url>
-  <issueTrackingUrl>http://jira.codehaus.org/BrowseProject.jspa?id=10313</issueTrackingUrl>
+  <issueTrackingUrl>http://jira.codehaus.org/browse/MPCHANGELOG</issueTrackingUrl>
   <siteDirectory>/www/maven.apache.org/reference/plugins/changelog/</siteDirectory>
   <repository>
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/changelog/</connection>
diff --git a/changes/project.xml b/changes/project.xml
index bb85692a..c44f548b 100644
--- a/changes/project.xml
+++ b/changes/project.xml
@@ -26,7 +26,7 @@
   <currentVersion>1.4</currentVersion>
   <shortDescription>Produce changes report</shortDescription>
   <url>http://maven.apache.org/reference/plugins/changes/</url>
-  <issueTrackingUrl>http://jira.codehaus.org/BrowseProject.jspa?id=10312</issueTrackingUrl>
+  <issueTrackingUrl>http://jira.codehaus.org/browse/MPCHANGES</issueTrackingUrl>
   <siteDirectory>/www/maven.apache.org/reference/plugins/changes/</siteDirectory>
   <repository>
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/changes/</connection>
diff --git a/checkstyle/project.xml b/checkstyle/project.xml
index aa39b373..19954726 100644
--- a/checkstyle/project.xml
+++ b/checkstyle/project.xml
@@ -27,7 +27,7 @@
   <description/>
   <shortDescription>Produce Checkstyle report</shortDescription>
   <url>http://maven.apache.org/reference/plugins/checkstyle/</url>
-  <issueTrackingUrl>http://jira.codehaus.org/BrowseProject.jspa?id=10315</issueTrackingUrl>
+  <issueTrackingUrl>http://jira.codehaus.org/browse/MPCHECKSTYLE</issueTrackingUrl>
   <siteDirectory>/www/maven.apache.org/reference/plugins/checkstyle/</siteDirectory>
   <repository>
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/checkstyle/</connection>
diff --git a/clean/project.xml b/clean/project.xml
index 975d2b6c..73afe323 100644
--- a/clean/project.xml
+++ b/clean/project.xml
@@ -27,13 +27,13 @@
   <description/>
   <shortDescription>Clean plugin for Maven</shortDescription>
   <url>http://maven.apache.org/reference/plugins/clean/</url>
+  <issueTrackingUrl>http://jira.codehaus.org/browse/MPCLEAN</issueTrackingUrl>
   <siteDirectory>/www/maven.apache.org/reference/plugins/clean/</siteDirectory>
   <repository>
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/clean</connection>
     <developerConnection>scm:cvs:ext:${maven.username}@cvs.apache.org:/home/cvs:maven-plugins/clean/</developerConnection>
     <url>http://cvs.apache.org/viewcvs/maven-plugins/clean</url>
   </repository>
-  <issueTrackingUrl>http://jira.codehaus.org/secure/BrowseProject.jspa?id=10610</issueTrackingUrl>
   <versions>
     <version>
       <id>1.1</id>
diff --git a/clover/project.xml b/clover/project.xml
index d0f79736..51d154bf 100644
--- a/clover/project.xml
+++ b/clover/project.xml
@@ -27,7 +27,7 @@
   <description/>
   <shortDescription>Produce Clover reports</shortDescription>
   <url>http://maven.apache.org/reference/plugins/clover/</url>
-  <issueTrackingUrl>http://jira.codehaus.org/BrowseProject.jspa?id=10314</issueTrackingUrl>
+  <issueTrackingUrl>http://jira.codehaus.org/browse/MPCLOVER</issueTrackingUrl>
   <siteDirectory>/www/maven.apache.org/reference/plugins/clover/</siteDirectory>
   <repository>
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/clover/</connection>
diff --git a/console/project.xml b/console/project.xml
index 5f98cf22..3790d559 100644
--- a/console/project.xml
+++ b/console/project.xml
@@ -26,7 +26,7 @@
   <currentVersion>1.1</currentVersion>
   <shortDescription>Console for Maven</shortDescription>
   <url>http://maven.apache.org/reference/plugins/console/</url>
-  <issueTrackingUrl>http://jira.codehaus.org/BrowseProject.jspa?id=10361</issueTrackingUrl>
+  <issueTrackingUrl>http://jira.codehaus.org/browse/MPCONSOLE</issueTrackingUrl>
   <siteAddress>jakarta.apache.org</siteAddress>
   <siteDirectory>/www/maven.apache.org/reference/plugins/console/</siteDirectory>
   <repository>
diff --git a/dashboard/project.xml b/dashboard/project.xml
index 2011d197..a0722864 100644
--- a/dashboard/project.xml
+++ b/dashboard/project.xml
@@ -27,7 +27,7 @@
   <description>Generate a dashboard containing global statistics about other maven reports</description>
   <shortDescription>Generate a statistic dashboard</shortDescription>
   <url>http://maven.apache.org/reference/plugins/dashboard/</url>
-  <issueTrackingUrl>http://jira.codehaus.org/BrowseProject.jspa?id=10321</issueTrackingUrl>
+  <issueTrackingUrl>http://jira.codehaus.org/browse/MPDASHBOARD</issueTrackingUrl>
   <siteDirectory>/www/maven.apache.org/reference/plugins/dashboard/</siteDirectory>
   <repository>
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/dashboard/</connection>
diff --git a/developer-activity/project.xml b/developer-activity/project.xml
index f68df37d..b0258c2d 100644
--- a/developer-activity/project.xml
+++ b/developer-activity/project.xml
@@ -27,6 +27,7 @@
   <description>This document provides a report of activity in terms of CVS commits and breaks it out by developer. Requires Maven 1.0 RC2.</description>
   <shortDescription>Developer Activity report</shortDescription>
   <url>http://maven.apache.org/reference/plugins/developer-activity/</url>
+  <issueTrackingUrl>http://jira.codehaus.org/browse/MPDEVACTIVITY</issueTrackingUrl>
   <siteDirectory>/www/maven.apache.org/reference/plugins/developer-activity/</siteDirectory>
   <repository>
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/developer-activity</connection>
diff --git a/dist/project.xml b/dist/project.xml
index 3ea18aab..47bbee79 100644
--- a/dist/project.xml
+++ b/dist/project.xml
@@ -26,7 +26,7 @@
   <currentVersion>1.6-SNAPSHOT</currentVersion>
   <shortDescription>Create source and binary distributions</shortDescription>
   <url>http://maven.apache.org/reference/plugins/dist/</url>
-  <issueTrackingUrl>http://jira.codehaus.org/BrowseProject.jspa?id=10343</issueTrackingUrl>
+  <issueTrackingUrl>http://jira.codehaus.org/browse/MPDIST</issueTrackingUrl>
   <siteDirectory>/www/maven.apache.org/reference/plugins/dist/</siteDirectory>
   <repository>
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/dist</connection>
diff --git a/docbook/project.xml b/docbook/project.xml
index f52b177b..4574a9e9 100644
--- a/docbook/project.xml
+++ b/docbook/project.xml
@@ -26,6 +26,7 @@
   <currentVersion>1.2</currentVersion>
   <shortDescription>Convert docbook to xdoc</shortDescription>
   <url>http://maven.apache.org/reference/plugins/docbook/</url>
+  <issueTrackingUrl>http://jira.codehaus.org/browse/MPDOCBOOK</issueTrackingUrl>
   <siteDirectory>/www/maven.apache.org/reference/plugins/docbook/</siteDirectory>
   <repository>
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/docbook/</connection>
diff --git a/ear/project.xml b/ear/project.xml
index 09e56712..1ea1bacb 100644
--- a/ear/project.xml
+++ b/ear/project.xml
@@ -27,7 +27,7 @@
   <description>Ear Plugin for Maven</description>
   <shortDescription>Ear Plugin for Maven</shortDescription>
   <url>http://maven.apache.org/reference/plugins/ear/</url>
-  <issueTrackingUrl>http://jira.codehaus.org/BrowseProject.jspa?id=10323</issueTrackingUrl>
+  <issueTrackingUrl>http://jira.codehaus.org/browse/MPEAR</issueTrackingUrl>
   <siteDirectory>/www/maven.apache.org/reference/plugins/ear/</siteDirectory>
   <repository>
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/ear/</connection>
diff --git a/eclipse/project.xml b/eclipse/project.xml
index bd57f3c6..1ca3feed 100644
--- a/eclipse/project.xml
+++ b/eclipse/project.xml
@@ -27,7 +27,7 @@
   <description>A plugin to generate various files for the Eclipse IDE and ease the use of Maven within that environment. Requires Maven 1.0 RC2.</description>
   <shortDescription>Eclipse Plugin for Maven</shortDescription>
   <url>http://maven.apache.org/reference/plugins/eclipse/</url>
-  <issueTrackingUrl>http://jira.codehaus.org/BrowseProject.jspa?id=10352</issueTrackingUrl>
+  <issueTrackingUrl>http://jira.codehaus.org/browse/MPECLIPSE</issueTrackingUrl>
   <siteDirectory>/www/maven.apache.org/reference/plugins/eclipse/</siteDirectory>
   <repository>
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/eclipse/</connection>
diff --git a/ejb/project.xml b/ejb/project.xml
index 639c5f0b..da2a4489 100644
--- a/ejb/project.xml
+++ b/ejb/project.xml
@@ -27,7 +27,7 @@
   <description>EJB Plugin for Maven</description>
   <shortDescription>EJB Plugin for Maven</shortDescription>
   <url>http://maven.apache.org/reference/plugins/ejb/</url>
-  <issueTrackingUrl>http://jira.codehaus.org/BrowseProject.jspa?id=10333</issueTrackingUrl>
+  <issueTrackingUrl>http://jira.codehaus.org/browse/MPEJB</issueTrackingUrl>
   <siteDirectory>/www/maven.apache.org/reference/plugins/ejb/</siteDirectory>
   <repository>
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/ejb/</connection>
diff --git a/faq/project.xml b/faq/project.xml
index 3cb29ac2..47a3e8bb 100644
--- a/faq/project.xml
+++ b/faq/project.xml
@@ -28,7 +28,7 @@
   <description>Creates XDoc documentation from an FAQ XML document.</description>
   <shortDescription>FAQ Plugin</shortDescription>
   <url>http://maven.apache.org/reference/plugins/faq/</url>
-  <issueTrackingUrl>http://jira.codehaus.org/BrowseProject.jspa?id=10359</issueTrackingUrl>
+  <issueTrackingUrl>http://jira.codehaus.org/browse/MPFAQ</issueTrackingUrl>
   <siteDirectory>/www/maven.apache.org/reference/plugins/faq/</siteDirectory>
   <repository>
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/faq</connection>
diff --git a/file-activity/project.xml b/file-activity/project.xml
index 70917b16..dac2f1df 100644
--- a/file-activity/project.xml
+++ b/file-activity/project.xml
@@ -28,6 +28,7 @@
   <description>This document provides a report of activity in terms of CVS commits and breaks it out by file. Requires Maven 1.0 RC2.</description>
   <shortDescription>File activity Report</shortDescription>
   <url>http://maven.apache.org/reference/plugins/file-activity/</url>
+  <issueTrackingUrl>http://jira.codehaus.org/browse/MPFILEACTIVITY</issueTrackingUrl>
   <siteDirectory>/www/maven.apache.org/reference/plugins/file-activity/</siteDirectory>
   <repository>
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/file-activity</connection>
diff --git a/genapp/project.xml b/genapp/project.xml
index c432c0cb..ef9834d8 100644
--- a/genapp/project.xml
+++ b/genapp/project.xml
@@ -27,7 +27,7 @@
   <shortDescription>A collection of example projects showing how to use maven in different situations</shortDescription>
   <url>http://maven.apache.org/reference/plugins/genapp/</url>
   <siteDirectory>/www/maven.apache.org/reference/plugins/genapp/</siteDirectory>
-  <issueTrackingUrl>http://jira.codehaus.org/BrowseProject.jspa?id=10334</issueTrackingUrl>
+  <issueTrackingUrl>http://jira.codehaus.org/browse/MPGENAPP</issueTrackingUrl>
   <repository>
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/genapp/</connection>
     <developerConnection>scm:cvs:ext:${maven.username}@cvs.apache.org:/home/cvs:maven-plugins/genapp/</developerConnection>
diff --git a/gump/project.xml b/gump/project.xml
index 736ce02c..1457422b 100644
--- a/gump/project.xml
+++ b/gump/project.xml
@@ -27,6 +27,7 @@
   <description/>
   <shortDescription>produce Gump descriptor</shortDescription>
   <url>http://maven.apache.org/reference/plugins/gump/</url>
+  <issueTrackingUrl>http://jira.codehaus.org/browse/MPGUMP</issueTrackingUrl>
   <siteDirectory>/www/maven.apache.org/reference/plugins/gump/</siteDirectory>
   <repository>
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/gump/</connection>
diff --git a/hibernate/project.xml b/hibernate/project.xml
index 1d80fa80..0979c1fb 100644
--- a/hibernate/project.xml
+++ b/hibernate/project.xml
@@ -27,7 +27,7 @@
   <description/>
   <shortDescription>Work with Hibernate classes</shortDescription>
   <url>http://maven.apache.org/reference/plugins/hibernate/</url>
-  <issueTrackingUrl>http://jira.codehaus.org/BrowseProject.jspa?id=10337</issueTrackingUrl>
+  <issueTrackingUrl>http://jira.codehaus.org/browse/MPHIBERNATE</issueTrackingUrl>
   <siteDirectory>/www/maven.apache.org/reference/plugins/hibernate/</siteDirectory>
   <repository>
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/hibernate/</connection>
diff --git a/html2xdoc/project.xml b/html2xdoc/project.xml
index 06b7bde2..43866ba7 100644
--- a/html2xdoc/project.xml
+++ b/html2xdoc/project.xml
@@ -28,7 +28,7 @@
   <description>Creates XDoc documentation from normal HTML documentation.</description>
   <shortDescription>HTML to xdoc transformer</shortDescription>
   <url>http://maven.apache.org/reference/plugins/html2xdoc/</url>
-  <issueTrackingUrl>http://jira.codehaus.org/BrowseProject.jspa?id=10354</issueTrackingUrl>
+  <issueTrackingUrl>http://jira.codehaus.org/browse/MPHTMLXDOC</issueTrackingUrl>
   <siteDirectory>/www/maven.apache.org/reference/plugins/html2xdoc/</siteDirectory>
   <repository>
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/html2xdoc/</connection>
diff --git a/idea/project.xml b/idea/project.xml
index c9ee5717..e42fc4cf 100644
--- a/idea/project.xml
+++ b/idea/project.xml
@@ -27,7 +27,7 @@
   <shortDescription>IDEA Plugin for Maven</shortDescription>
   <description>IDEA Plugin for Maven. Requires Maven 1.0 RC3.</description>
   <url>http://maven.apache.org/reference/plugins/idea/</url>
-  <issueTrackingUrl>http://jira.codehaus.org/BrowseProject.jspa?id=10350</issueTrackingUrl>
+  <issueTrackingUrl>http://jira.codehaus.org/browse/MPIDEA</issueTrackingUrl>
   <siteDirectory>/www/maven.apache.org/reference/plugins/idea/</siteDirectory>
   <repository>
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/idea/</connection>
diff --git a/j2ee/project.xml b/j2ee/project.xml
index afad00a3..c406c3ea 100644
--- a/j2ee/project.xml
+++ b/j2ee/project.xml
@@ -27,6 +27,7 @@
   <description/>
   <shortDescription>J2EE tools</shortDescription>
   <url>http://maven.apache.org/reference/plugins/j2ee/</url>
+  <issueTrackingUrl>http://jira.codehaus.org/browse/MPJEE</issueTrackingUrl>
   <siteDirectory>/www/maven.apache.org/reference/plugins/j2ee/</siteDirectory>
   <repository>
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/j2ee/</connection>
diff --git a/jalopy/project.xml b/jalopy/project.xml
index 811dbb91..f7095530 100644
--- a/jalopy/project.xml
+++ b/jalopy/project.xml
@@ -27,7 +27,7 @@
   <description/>
   <shortDescription>Reformat java source</shortDescription>
   <url>http://maven.apache.org/reference/plugins/jalopy/</url>
-  <issueTrackingUrl>http://jira.codehaus.org/BrowseProject.jspa?id=10345</issueTrackingUrl>
+  <issueTrackingUrl>http://jira.codehaus.org/browse/MPJALOPY</issueTrackingUrl>
   <siteDirectory>/www/maven.apache.org/reference/plugins/jalopy/</siteDirectory>
   <repository>
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/jalopy/</connection>
diff --git a/jar/project.xml b/jar/project.xml
index 06a22ca9..00fd3b8c 100644
--- a/jar/project.xml
+++ b/jar/project.xml
@@ -27,7 +27,7 @@
   <description>Plugin for creating JAR files. Requires Maven 1.0 RC2.</description>
   <shortDescription>Create jar files</shortDescription>
   <url>http://maven.apache.org/reference/plugins/jar/</url>
-  <issueTrackingUrl>http://jira.codehaus.org/BrowseProject.jspa?id=10362</issueTrackingUrl>
+  <issueTrackingUrl>http://jira.codehaus.org/browse/MPJAR</issueTrackingUrl>
   <siteDirectory>/www/maven.apache.org/reference/plugins/jar/</siteDirectory>
   <repository>
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/jar</connection>
diff --git a/java/project.xml b/java/project.xml
index adfd6545..e1887919 100644
--- a/java/project.xml
+++ b/java/project.xml
@@ -27,7 +27,7 @@
   <description/>
   <shortDescription>Compile java code</shortDescription>
   <url>http://maven.apache.org/reference/plugins/java/</url>
-  <issueTrackingUrl>http://jira.codehaus.org/BrowseProject.jspa?id=10363</issueTrackingUrl>
+  <issueTrackingUrl>http://jira.codehaus.org/browse/MPJAVA</issueTrackingUrl>
   <siteDirectory>/www/maven.apache.org/reference/plugins/java/</siteDirectory>
   <repository>
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/java</connection>
diff --git a/javacc/project.xml b/javacc/project.xml
index 2ce28442..621e4810 100644
--- a/javacc/project.xml
+++ b/javacc/project.xml
@@ -27,7 +27,7 @@
   <description/>
   <shortDescription>Process javacc/jtree grammars</shortDescription>
   <url>http://maven.apache.org/reference/plugins/javacc/</url>
-  <issueTrackingUrl>http://jira.codehaus.org/BrowseProject.jspa?id=10580</issueTrackingUrl>
+  <issueTrackingUrl>http://jira.codehaus.org/browse/MPJAVACC</issueTrackingUrl>
   <siteDirectory>/www/maven.apache.org/reference/plugins/javacc/</siteDirectory>
   <repository>
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/javacc/</connection>
diff --git a/javadoc/project.xml b/javadoc/project.xml
index dc9a42d5..7a49a8a0 100644
--- a/javadoc/project.xml
+++ b/javadoc/project.xml
@@ -25,7 +25,7 @@
   <description/>
   <shortDescription>Produce Javadocs and report</shortDescription>
   <url>http://maven.apache.org/reference/plugins/javadoc/</url>
-  <issueTrackingUrl>http://jira.codehaus.org/BrowseProject.jspa?id=10357</issueTrackingUrl>
+  <issueTrackingUrl>http://jira.codehaus.org/browse/MPJAVADOC</issueTrackingUrl>
   <siteDirectory>/www/maven.apache.org/reference/plugins/javadoc/</siteDirectory>
   <repository>
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/javadoc/</connection>
diff --git a/jboss/project.xml b/jboss/project.xml
index d57b5de8..8dcef985 100644
--- a/jboss/project.xml
+++ b/jboss/project.xml
@@ -27,7 +27,7 @@
   <description>Plugin for JBoss</description>
   <shortDescription>JBoss plugin</shortDescription>
   <url>http://maven.apache.org/reference/plugins/jboss/</url>
-  <issueTrackingUrl>http://jira.codehaus.org/BrowseProject.jspa?id=10324</issueTrackingUrl>
+  <issueTrackingUrl>http://jira.codehaus.org/browse/MPJBOSS</issueTrackingUrl>
   <siteDirectory>/www/maven.apache.org/reference/plugins/jboss/</siteDirectory>
   <repository>
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/jboss/</connection>
diff --git a/jbuilder/project.xml b/jbuilder/project.xml
index bfb219b7..c599bf22 100644
--- a/jbuilder/project.xml
+++ b/jbuilder/project.xml
@@ -27,7 +27,7 @@
   <description/>
   <shortDescription>JBuilder Plugin for Maven</shortDescription>
   <url>http://maven.apache.org/reference/plugins/jbuilder/</url>
-  <issueTrackingUrl>http://jira.codehaus.org/BrowseProject.jspa?id=10351</issueTrackingUrl>
+  <issueTrackingUrl>http://jira.codehaus.org/browse/MPJBUILDER</issueTrackingUrl>
   <siteDirectory>/www/maven.apache.org/reference/plugins/jbuilder/</siteDirectory>
   <repository>
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/jbuilder/</connection>
diff --git a/jcoverage/project.xml b/jcoverage/project.xml
index 3ec37e40..fd6e2201 100644
--- a/jcoverage/project.xml
+++ b/jcoverage/project.xml
@@ -28,13 +28,13 @@
   <description>This plugin provides coverage analysis of your source-code based on the open-source jcoverage tool.</description>
   <shortDescription>This plugin provides coverage analysis of your source-code based on the open-source jcoverage tool.</shortDescription>
   <url>http://maven.apache.org/reference/plugins/jcoverage/</url>
+  <issueTrackingUrl>http://jira.codehaus.org/browse/MPJCOVERAGE</issueTrackingUrl>
   <siteDirectory>/www/maven.apache.org/reference/plugins/jcoverage/</siteDirectory>
   <repository>
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/jcoverage/</connection>
     <developerConnection>scm:cvs:ext:${maven.username}@cvs.apache.org:/home/cvs:maven-plugins/jcoverage/</developerConnection>
     <url>http://cvs.apache.org/viewcvs/maven-plugins/jcoverage/</url>
   </repository>
-  <issueTrackingUrl>http://jira.codehaus.org/secure/BrowseProject.jspa?id=10348</issueTrackingUrl>
   <versions>
     <version>
       <id>1.0.2</id>
diff --git a/jdee/project.xml b/jdee/project.xml
index a410e532..011d2eb0 100644
--- a/jdee/project.xml
+++ b/jdee/project.xml
@@ -31,6 +31,7 @@
 </description>
   <shortDescription>JDEE Plugin for Maven</shortDescription>
   <url>http://maven.apache.org/reference/plugins/jdee/</url>
+  <issueTrackingUrl>http://jira.codehaus.org/browse/MPJDEE</issueTrackingUrl>
   <siteDirectory>/www/maven.apache.org/reference/plugins/jdee/</siteDirectory>
   <repository>
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/jdee/</connection>
diff --git a/jdepend/project.xml b/jdepend/project.xml
index 5eb6a42d..a2dbacb5 100644
--- a/jdepend/project.xml
+++ b/jdepend/project.xml
@@ -27,6 +27,7 @@
   <description/>
   <shortDescription>Produce metrics</shortDescription>
   <url>http://maven.apache.org/reference/plugins/jdepend/</url>
+  <issueTrackingUrl>http://jira.codehaus.org/browse/MPJDEPEND</issueTrackingUrl>
   <siteDirectory>/www/maven.apache.org/reference/plugins/jdepend/</siteDirectory>
   <repository>
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/jdepend/</connection>
diff --git a/jdeveloper/project.xml b/jdeveloper/project.xml
index 77ac7d5f..11237252 100644
--- a/jdeveloper/project.xml
+++ b/jdeveloper/project.xml
@@ -28,7 +28,7 @@
   <description>A plugin to generate various files for Oracle's JDeveloper IDE and ease the use of Maven within that environment</description>
   <shortDescription>JDeveloper Plugin for Maven</shortDescription>
   <url>http://maven.apache.org/reference/plugins/jdeveloper/</url>
-  <issueTrackingUrl>http://jira.codehaus.org/BrowseProject.jspa?id=10376</issueTrackingUrl>
+  <issueTrackingUrl>http://jira.codehaus.org/browse/MPJDEVELOPER</issueTrackingUrl>
   <siteDirectory>/www/maven.apache.org/reference/plugins/jdeveloper/</siteDirectory>
   <repository>
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/jdeveloper</connection>
diff --git a/jdiff/project.xml b/jdiff/project.xml
index 0a4b9cfe..9be15e9f 100644
--- a/jdiff/project.xml
+++ b/jdiff/project.xml
@@ -28,13 +28,13 @@
   <description/>
   <shortDescription>Diff between CVS releases</shortDescription>
   <url>http://maven.apache.org/reference/plugins/jdiff/</url>
+  <issueTrackingUrl>http://jira.codehaus.org/browse/MPJDIFF</issueTrackingUrl>
   <siteDirectory>/www/maven.apache.org/reference/plugins/jdiff/</siteDirectory>
   <repository>
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/jdiff/</connection>
     <developerConnection>scm:cvs:ext:${maven.username}@cvs.apache.org:/home/cvs:maven-plugins/jdiff/</developerConnection>
     <url>http://cvs.apache.org/viewcvs/maven-plugins/jdiff/</url>
   </repository>
-  <issueTrackingUrl>http://jira.codehaus.org/secure/BrowseProject.jspa?id=10374</issueTrackingUrl>
   <versions>
     <version>
       <id>1.2</id>
diff --git a/jellydoc/project.xml b/jellydoc/project.xml
index e5755e3a..24f0a13e 100644
--- a/jellydoc/project.xml
+++ b/jellydoc/project.xml
@@ -30,6 +30,7 @@
   <description>Creates a JavaDoc like report for any Jelly Tags used in a project.</description>
   <shortDescription>Javadoc stuff for Jelly tags</shortDescription>
   <url>http://maven.apache.org/reference/plugins/jellydoc/</url>
+  <issueTrackingUrl>http://jira.codehaus.org/browse/MPJELLYDOC</issueTrackingUrl>
   <siteDirectory>/www/maven.apache.org/reference/plugins/jellydoc/</siteDirectory>
   <repository>
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/jellydoc/</connection>
diff --git a/jetty/project.xml b/jetty/project.xml
index 3ca39956..74d30f2d 100644
--- a/jetty/project.xml
+++ b/jetty/project.xml
@@ -26,7 +26,7 @@
   <currentVersion>1.1</currentVersion>
   <shortDescription>Run Jetty</shortDescription>
   <url>http://maven.apache.org/reference/plugins/jetty/</url>
-  <issueTrackingUrl>http://jira.codehaus.org/BrowseProject.jspa?id=10421</issueTrackingUrl>
+  <issueTrackingUrl>http://jira.codehaus.org/browse/MPJETTY</issueTrackingUrl>
   <siteDirectory>/www/maven.apache.org/reference/plugins/jetty/</siteDirectory>
   <repository>
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/jetty/</connection>
diff --git a/jira/project.xml b/jira/project.xml
index 0c3c394d..c7129e3c 100644
--- a/jira/project.xml
+++ b/jira/project.xml
@@ -27,7 +27,7 @@
   <description>This plugin download issues from Jira and create a report.</description>
   <shortDescription>Download issue from Jira</shortDescription>
   <url>http://maven.apache.org/reference/plugins/jira/</url>
-  <issueTrackingUrl>http://jira.codehaus.org/secure/BrowseProject.jspa?id=10450</issueTrackingUrl>
+  <issueTrackingUrl>http://jira.codehaus.org/browse/MPJIRA</issueTrackingUrl>
   <siteDirectory>/www/maven.apache.org/reference/plugins/jira/</siteDirectory>
   <repository>
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/jira/</connection>
diff --git a/jnlp/project.xml b/jnlp/project.xml
index 1c6ca61a..0d9c47c7 100644
--- a/jnlp/project.xml
+++ b/jnlp/project.xml
@@ -26,13 +26,13 @@
   <currentVersion>1.4-SNAPSHOT</currentVersion>
   <shortDescription>JNLP Plugin for Maven</shortDescription>
   <url>http://maven.apache.org/reference/plugins/jnlp/</url>
+  <issueTrackingUrl>http://jira.codehaus.org/browse/MPJNLP</issueTrackingUrl>
   <siteDirectory>/www/maven.apache.org/reference/plugins/jnlp/</siteDirectory>
   <repository>
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/jnlp/</connection>
     <developerConnection>scm:cvs:ext:${maven.username}@cvs.apache.org:/home/cvs:maven-plugins/jnlp/</developerConnection>
     <url>http://cvs.apache.org/viewcvs/maven-plugins/jnlp/</url>
   </repository>
-  <issueTrackingUrl>http://jira.codehaus.org/secure/BrowseProject.jspa?id=10342</issueTrackingUrl>
   <developers>
     <developer>
       <name>Emmanuel Venisse</name>
diff --git a/junit-report/project.xml b/junit-report/project.xml
index 1991ee2f..464e703b 100644
--- a/junit-report/project.xml
+++ b/junit-report/project.xml
@@ -27,6 +27,7 @@
   <description>Reports from JUnit tests. Requires Maven 1.0 RC2.</description>
   <shortDescription>Reports from JUnit tests</shortDescription>
   <url>http://maven.apache.org/reference/plugins/junit-report/</url>
+  <issueTrackingUrl>http://jira.codehaus.org/browse/MPJUNITREPORT</issueTrackingUrl>
   <siteDirectory>/www/maven.apache.org/reference/plugins/junit-report/</siteDirectory>
   <repository>
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/junit-report/</connection>
diff --git a/junitdoclet/project.xml b/junitdoclet/project.xml
index c507c641..a8361c0d 100644
--- a/junitdoclet/project.xml
+++ b/junitdoclet/project.xml
@@ -27,7 +27,7 @@
   <description>A plugin to generate test cases use JUnitDoclet</description>
   <shortDescription>JUnitDoclet test generator</shortDescription>
   <url>http://maven.apache.org/reference/plugins/junitdoclet/</url>
-  <issueTrackingUrl>http://jira.codehaus.org/BrowseProject.jspa?id=10394</issueTrackingUrl>
+  <issueTrackingUrl>http://jira.codehaus.org/browse/MPJUNITDOCLET</issueTrackingUrl>
   <siteDirectory>/www/maven.apache.org/reference/plugins/junitdoclet/</siteDirectory>
   <repository>
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/junitdoclet/</connection>
diff --git a/jxr/project.xml b/jxr/project.xml
index 3e053a70..909a4748 100644
--- a/jxr/project.xml
+++ b/jxr/project.xml
@@ -27,7 +27,7 @@
   <description>Create cross reference. Requires Maven 1.0 RC2.</description>
   <shortDescription>Create cross reference</shortDescription>
   <url>http://maven.apache.org/reference/plugins/jxr/</url>
-  <issueTrackingUrl>http://jira.codehaus.org/BrowseProject.jspa?id=10341</issueTrackingUrl>
+  <issueTrackingUrl>http://jira.codehaus.org/browse/MPJXR</issueTrackingUrl>
   <siteDirectory>/www/maven.apache.org/reference/plugins/jxr/</siteDirectory>
   <repository>
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/jxr/</connection>
diff --git a/latex/project.xml b/latex/project.xml
index 5ce68228..133dfa60 100644
--- a/latex/project.xml
+++ b/latex/project.xml
@@ -27,7 +27,7 @@
   <description/>
   <shortDescription>Produce HTML from latex</shortDescription>
   <url>http://maven.apache.org/reference/plugins/latex/</url>
-  <issueTrackingUrl>http://jira.codehaus.org/BrowseProject.jspa?id=10344</issueTrackingUrl>
+  <issueTrackingUrl>http://jira.codehaus.org/browse/MPLATEX</issueTrackingUrl>
   <siteDirectory>/www/maven.apache.org/reference/plugins/latex/</siteDirectory>
   <repository>
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/latex/</connection>
diff --git a/latka/project.xml b/latka/project.xml
index 88214513..f9e7e13f 100644
--- a/latka/project.xml
+++ b/latka/project.xml
@@ -27,7 +27,7 @@
   <description/>
   <shortDescription>Run Latka scripts</shortDescription>
   <url>http://maven.apache.org/reference/plugins/latka/</url>
-  <issueTrackingUrl>http://jira.codehaus.org/BrowseProject.jspa?id=10371</issueTrackingUrl>
+  <issueTrackingUrl>http://jira.codehaus.org/browse/MPLATKA</issueTrackingUrl>
   <siteDirectory>/www/maven.apache.org/reference/plugins/latka/</siteDirectory>
   <repository>
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/latka/</connection>
diff --git a/license/project.xml b/license/project.xml
index 46ee8967..af6855cf 100644
--- a/license/project.xml
+++ b/license/project.xml
@@ -27,6 +27,7 @@
   <description/>
   <shortDescription>Create xml version of license</shortDescription>
   <url>http://maven.apache.org/reference/plugins/license/</url>
+  <issueTrackingUrl>http://jira.codehaus.org/browse/MPLICENSE</issueTrackingUrl>
   <siteDirectory>/www/maven.apache.org/reference/plugins/license/</siteDirectory>
   <repository>
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/license/</connection>
diff --git a/linkcheck/project.xml b/linkcheck/project.xml
index 59038f53..3c356540 100644
--- a/linkcheck/project.xml
+++ b/linkcheck/project.xml
@@ -27,7 +27,7 @@
   <description>Check xdoc links. Requires Maven 1.0 RC2.</description>
   <shortDescription>Check xdoc links</shortDescription>
   <url>http://maven.apache.org/reference/plugins/linkcheck/</url>
-  <issueTrackingUrl>http://jira.codehaus.org/BrowseProject.jspa?id=10353</issueTrackingUrl>
+  <issueTrackingUrl>http://jira.codehaus.org/browse/MPLINKCHECK</issueTrackingUrl>
   <siteDirectory>/www/maven.apache.org/reference/plugins/linkcheck/</siteDirectory>
   <repository>
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/linkcheck/</connection>
diff --git a/multichanges/project.xml b/multichanges/project.xml
index ae003648..5b9ee980 100644
--- a/multichanges/project.xml
+++ b/multichanges/project.xml
@@ -26,7 +26,7 @@
   <currentVersion>1.1</currentVersion>
   <description>Produce release dashboard for subprojects. Requires Maven 1.0 RC3.</description>
   <url>http://maven.apache.org/reference/plugins/multichanges/</url>
-  <issueTrackingUrl>http://jira.codehaus.org/BrowseProject.jspa?id=10322</issueTrackingUrl>
+  <issueTrackingUrl>http://jira.codehaus.org/browse/MPMULTICHANGES</issueTrackingUrl>
   <siteDirectory>/www/maven.apache.org/reference/plugins/multichanges/</siteDirectory>
   <repository>
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/multichanges/</connection>
diff --git a/multiproject/project.xml b/multiproject/project.xml
index c9b3775f..af53f42a 100644
--- a/multiproject/project.xml
+++ b/multiproject/project.xml
@@ -26,7 +26,7 @@
   <description>A plugin to handle the building of multiple projects within maven. Requires Maven 1.0 RC3</description>
   <shortDescription>Multi-Project Plugin for Maven</shortDescription>
   <url>http://maven.apache.org/reference/plugins/multiproject/</url>
-  <issueTrackingUrl>http://jira.codehaus.org/BrowseProject.jspa?id=10349</issueTrackingUrl>
+  <issueTrackingUrl>http://jira.codehaus.org/browse/MPMULTIPROJECT</issueTrackingUrl>
   <siteDirectory>/www/maven.apache.org/reference/plugins/multiproject/</siteDirectory>
   <repository>
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/multiproject/</connection>
diff --git a/native/project.xml b/native/project.xml
index 414e66de..bec32069 100644
--- a/native/project.xml
+++ b/native/project.xml
@@ -27,8 +27,8 @@
   <description>Plugin for native compilation c,c++, fortran</description>
   <shortDescription>Native plugin</shortDescription>
   <url>http://maven.apache.org/reference/plugins/native/</url>
+  <issueTrackingUrl>http://jira.codehaus.org/browse/MPNATIVE</issueTrackingUrl>
   <siteDirectory>/www/maven.apache.org/reference/plugins/native/</siteDirectory>
-  <issueTrackingUrl>http://jira.codehaus.org/secure/BrowseProject.jspa?id=10451</issueTrackingUrl>
   <repository>
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/native/</connection>
     <developerConnection>scm:cvs:ext:${maven.username}@cvs.apache.org:/home/cvs:maven-plugins/native/</developerConnection>
diff --git a/nsis/project.xml b/nsis/project.xml
index ba00575a..b00115be 100644
--- a/nsis/project.xml
+++ b/nsis/project.xml
@@ -27,7 +27,7 @@
   <description>A plugin to generate Win32 installer programs using NSIS</description>
   <shortDescription>NSIS Plugin for Maven</shortDescription>
   <url>http://maven.apache.org/reference/plugins/nsis/</url>
-  <issueTrackingUrl>http://jira.codehaus.org/BrowseProject.jspa?id=10440</issueTrackingUrl>
+  <issueTrackingUrl>http://jira.codehaus.org/browse/MPNSIS</issueTrackingUrl>
   <siteDirectory>/www/maven.apache.org/reference/plugins/nsis/</siteDirectory>
   <repository>
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/nsis/</connection>
diff --git a/pdf/project.xml b/pdf/project.xml
index d886b60f..cfc18800 100644
--- a/pdf/project.xml
+++ b/pdf/project.xml
@@ -27,8 +27,8 @@
   <description>PDF Documentation generator</description>
   <shortDescription>Generator of project documentation in PDF Format.</shortDescription>
   <url>http://maven.apache.org/reference/plugins/pdf/</url>
+  <issueTrackingUrl>http://jira.codehaus.org/browse/MPPDF</issueTrackingUrl>
   <siteDirectory>/www/maven.apache.org/reference/plugins/pdf/</siteDirectory>
-  <issueTrackingUrl>http://jira.codehaus.org/secure/BrowseProject.jspa?id=10356</issueTrackingUrl>
   <repository>
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/pdf/</connection>
     <developerConnection>scm:cvs:ext:${maven.username}@cvs.apache.org:/home/cvs:maven-plugins/pdf/</developerConnection>
diff --git a/plugin-parent/project.xml b/plugin-parent/project.xml
index 8f99161a..25d7ea2a 100644
--- a/plugin-parent/project.xml
+++ b/plugin-parent/project.xml
@@ -34,7 +34,7 @@
   <package>org.apache.maven</package>
   <logo>http://maven.apache.org/images/maven.gif</logo>
 
-  <issueTrackingUrl>http://jira.codehaus.org/BrowseProject.jspa?id=10030</issueTrackingUrl>
+  <issueTrackingUrl>http://jira.codehaus.org/browse/MAVEN</issueTrackingUrl>
   <siteAddress>maven.apache.org</siteAddress>
   <siteDirectory>/www/maven.apache.org/reference/plugins/optional/</siteDirectory>
   <distributionSite>www.apache.org</distributionSite>
diff --git a/plugin/project.xml b/plugin/project.xml
index 4aec2b82..842be34e 100644
--- a/plugin/project.xml
+++ b/plugin/project.xml
@@ -27,7 +27,7 @@
   <description>Maven Plugin management plugin. Requires Maven 1.0 RC3.</description>
   <shortDescription>Maven Plugin plugin</shortDescription>
   <url>http://maven.apache.org/reference/plugins/plugin/</url>
-  <issueTrackingUrl>http://jira.codehaus.org/BrowseProject.jspa?id=10364</issueTrackingUrl>
+  <issueTrackingUrl>http://jira.codehaus.org/browse/MPPLUGIN</issueTrackingUrl>
   <siteDirectory>/www/maven.apache.org/reference/plugins/plugin/</siteDirectory>
   <repository>
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/plugin/</connection>
diff --git a/pmd/project.xml b/pmd/project.xml
index e4e03445..53db44fb 100644
--- a/pmd/project.xml
+++ b/pmd/project.xml
@@ -27,7 +27,7 @@
   <description>The Maven PMD plugin is a plugin that wraps the PMD framework (http://pmd.sourceforge.net). PMD is a source checking framework that works by scanning Java source code and looks for potential problems like: unused local variables, empty catch blocks, unused parameters, empty 'if' statements, etc.</description>
   <shortDescription>Maven Plugin for PMD</shortDescription>
   <url>http://maven.apache.org/reference/plugins/pmd/</url>
-  <issueTrackingUrl>http://jira.codehaus.org/BrowseProject.jspa?id=10358</issueTrackingUrl>
+  <issueTrackingUrl>http://jira.codehaus.org/browse/MPPMD</issueTrackingUrl>
   <siteDirectory>/www/maven.apache.org/reference/plugins/pmd/</siteDirectory>
   <repository>
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/pmd/</connection>
diff --git a/pom/project.xml b/pom/project.xml
index c4c8250c..573c9261 100644
--- a/pom/project.xml
+++ b/pom/project.xml
@@ -27,7 +27,7 @@
   <description/>
   <shortDescription>Check Project Object Model</shortDescription>
   <url>http://maven.apache.org/reference/plugins/pom/</url>
-  <issueTrackingUrl>http://jira.codehaus.org/BrowseProject.jspa?id=10375</issueTrackingUrl>
+  <issueTrackingUrl>http://jira.codehaus.org/browse/MPPOM</issueTrackingUrl>
   <siteDirectory>/www/maven.apache.org/reference/plugins/pom/</siteDirectory>
   <repository>
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/pom/</connection>
diff --git a/rar/project.xml b/rar/project.xml
index 9525ca1f..07ab1747 100644
--- a/rar/project.xml
+++ b/rar/project.xml
@@ -27,7 +27,7 @@
   <description>Rar Plugin for Maven</description>
   <shortDescription>Rar Plugin for Maven</shortDescription>
   <url>http://maven.apache.org/reference/plugins/rar/</url>
-  <issueTrackingUrl>http://jira.codehaus.org/BrowseProject.jspa?id=10630</issueTrackingUrl>
+  <issueTrackingUrl>http://jira.codehaus.org/browse/MPRAR</issueTrackingUrl>
   <siteDirectory>/www/maven.apache.org/reference/plugins/rar/</siteDirectory>
   <repository>
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/rar/</connection>
diff --git a/release/project.xml b/release/project.xml
index 06a84374..bd576b87 100644
--- a/release/project.xml
+++ b/release/project.xml
@@ -27,7 +27,7 @@
   <description/>
   <shortDescription>Produce project release</shortDescription>
   <url>http://maven.apache.org/reference/plugins/release/</url>
-  <issueTrackingUrl>http://jira.codehaus.org/BrowseProject.jspa?id=10346</issueTrackingUrl>
+  <issueTrackingUrl>http://jira.codehaus.org/browse/MPRELEASE</issueTrackingUrl>
   <siteDirectory>/www/maven.apache.org/reference/plugins/release/</siteDirectory>
   <repository>
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/release/</connection>
diff --git a/repository/project.xml b/repository/project.xml
index 91754103..e39e006b 100644
--- a/repository/project.xml
+++ b/repository/project.xml
@@ -26,7 +26,7 @@
   <currentVersion>1.2</currentVersion>
   <shortDescription>Tools to work with the central repo</shortDescription>
   <url>http://maven.apache.org/reference/plugins/repository/</url>
-  <issueTrackingUrl>http://jira.codehaus.org/BrowseProject.jspa?id=10372</issueTrackingUrl>
+  <issueTrackingUrl>http://jira.codehaus.org/browse/MPREPO</issueTrackingUrl>
   <siteDirectory>/www/maven.apache.org/reference/plugins/repository/</siteDirectory>
   <repository>
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/repository/</connection>
diff --git a/scm/project.xml b/scm/project.xml
index 382fb485..b309e7e7 100644
--- a/scm/project.xml
+++ b/scm/project.xml
@@ -26,7 +26,7 @@
   <description>A plugin for SCM tasks, currently CVS.</description>
   <shortDescription>SCM Plugin for Maven. Requires Maven 1.0 RC2.</shortDescription>
   <url>http://maven.apache.org/reference/plugins/scm/</url>
-  <issueTrackingUrl>http://jira.codehaus.org/BrowseProject.jspa?id=10347</issueTrackingUrl>
+  <issueTrackingUrl>http://jira.codehaus.org/browse/MPSCM</issueTrackingUrl>
   <siteDirectory>/www/maven.apache.org/reference/plugins/scm/</siteDirectory>
   <repository>
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/scm/</connection>
diff --git a/shell/project.xml b/shell/project.xml
index 833494ed..8c7a1a31 100644
--- a/shell/project.xml
+++ b/shell/project.xml
@@ -27,6 +27,7 @@
   <description>A plugin to generate various files for different shells to allow tab completion for maven goals</description>
   <shortDescription>Shell Plugin for Maven</shortDescription>
   <url>http://maven.apache.org/reference/plugins/shell/</url>
+  <issueTrackingUrl>http://jira.codehaus.org/browse/MPSHELL</issueTrackingUrl>
   <siteDirectory>/www/maven.apache.org/reference/plugins/shell/</siteDirectory>
   <repository>
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/shell/</connection>
diff --git a/simian/project.xml b/simian/project.xml
index 01c79a42..f4f8f0ff 100644
--- a/simian/project.xml
+++ b/simian/project.xml
@@ -26,7 +26,7 @@
   <description>Simian Plugin for Maven</description>
   <shortDescription>Simian Plugin for Maven</shortDescription>
   <url>http://maven.apache.org/reference/plugins/simian/</url>
-  <issueTrackingUrl>http://jira.codehaus.org/BrowseProject.jspa?id=10360</issueTrackingUrl>
+  <issueTrackingUrl>http://jira.codehaus.org/browse/MPSIMIAN</issueTrackingUrl>
   <siteDirectory>/www/maven.apache.org/reference/plugins/simian/</siteDirectory>
   <package>org.apache.maven.simian</package>
   <repository>
diff --git a/site/project.xml b/site/project.xml
index 60b60927..a7945b72 100644
--- a/site/project.xml
+++ b/site/project.xml
@@ -27,7 +27,7 @@
   <description>Generate web site. Requires Maven 1.0 RC2.</description>
   <shortDescription>Generate web site</shortDescription>
   <url>http://maven.apache.org/reference/plugins/site/</url>
-  <issueTrackingUrl>http://jira.codehaus.org/BrowseProject.jspa?id=10331</issueTrackingUrl>
+  <issueTrackingUrl>http://jira.codehaus.org/browse/MPSITE</issueTrackingUrl>
   <siteDirectory>/www/maven.apache.org/reference/plugins/site/</siteDirectory>
   <repository>
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/site/</connection>
diff --git a/struts/project.xml b/struts/project.xml
index 48aaa852..35452915 100644
--- a/struts/project.xml
+++ b/struts/project.xml
@@ -27,6 +27,7 @@
   <description/>
   <shortDescription>Work with struts jars</shortDescription>
   <url>http://maven.apache.org/reference/plugins/struts/</url>
+  <issueTrackingUrl>http://jira.codehaus.org/browse/MPSTRUTS</issueTrackingUrl>
   <siteDirectory>/www/maven.apache.org/reference/plugins/struts/</siteDirectory>
   <repository>
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/struts/</connection>
diff --git a/tasklist/project.xml b/tasklist/project.xml
index edf91945..24f892f4 100644
--- a/tasklist/project.xml
+++ b/tasklist/project.xml
@@ -27,7 +27,7 @@
   <description/>
   <shortDescription>Create xdoc from @TODO tags</shortDescription>
   <url>http://maven.apache.org/reference/plugins/tasklist/</url>
-  <issueTrackingUrl>http://jira.codehaus.org/BrowseProject.jspa?id=10339</issueTrackingUrl>
+  <issueTrackingUrl>http://jira.codehaus.org/browse/MPTASKLIST</issueTrackingUrl>
   <siteDirectory>/www/maven.apache.org/reference/plugins/tasklist/</siteDirectory>
   <repository>
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/tasklist/</connection>
diff --git a/test/project.xml b/test/project.xml
index ea558bf3..4bd846b3 100644
--- a/test/project.xml
+++ b/test/project.xml
@@ -27,7 +27,7 @@
   <description>Run JUnit tests. Requires Maven 1.0 RC2.</description>
   <shortDescription>Run JUnit tests</shortDescription>
   <url>http://maven.apache.org/reference/plugins/test/</url>
-  <issueTrackingUrl>http://jira.codehaus.org/BrowseProject.jspa?id=10365</issueTrackingUrl>
+  <issueTrackingUrl>http://jira.codehaus.org/browse/MPTEST</issueTrackingUrl>
   <siteDirectory>/www/maven.apache.org/reference/plugins/test/</siteDirectory>
   <repository>
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/test/</connection>
diff --git a/tjdo/project.xml b/tjdo/project.xml
index ac70a3a0..a73a733b 100644
--- a/tjdo/project.xml
+++ b/tjdo/project.xml
@@ -27,6 +27,7 @@
   <description/>
   <shortDescription>Maven TJDO plugin</shortDescription>
   <url>http://maven.apache.org/reference/plugins/tjdo/</url>
+  <issueTrackingUrl>http://jira.codehaus.org/browse/MPTJDO</issueTrackingUrl>
   <siteDirectory>/www/maven.apache.org/reference/plugins/tjdo/</siteDirectory>
   <repository>
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/tjdo/</connection>
diff --git a/uberjar/project.xml b/uberjar/project.xml
index a2c07aaa..ca16f781 100644
--- a/uberjar/project.xml
+++ b/uberjar/project.xml
@@ -39,7 +39,7 @@
   <!-- the project home page -->
 
   <url>http://maven.apache.org/reference/plugins/uberjar/</url>
-  <issueTrackingUrl>http://jira.codehaus.org/BrowseProject.jspa?id=10340</issueTrackingUrl>
+  <issueTrackingUrl>http://jira.codehaus.org/browse/MPUBERJAR</issueTrackingUrl>
   <siteDirectory>/www/maven.apache.org/reference/plugins/uberjar/</siteDirectory>
   <repository>
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/uberjar/</connection>
diff --git a/vdoclet/project.xml b/vdoclet/project.xml
index 84e03b05..102ff49b 100644
--- a/vdoclet/project.xml
+++ b/vdoclet/project.xml
@@ -27,7 +27,7 @@
   <description>VDoclet plugin for Maven. Allows you to easily create information from source code using velocity driven templates</description>
   <shortDescription>VDoclet plugin for Maven</shortDescription>
   <url>http://maven.apache.org/reference/plugins/vdoclet/</url>
-  <issueTrackingUrl>http://jira.codehaus.org/BrowseProject.jspa?id=10400</issueTrackingUrl>
+  <issueTrackingUrl>http://jira.codehaus.org/browse/MPVDOCLET</issueTrackingUrl>
   <siteDirectory>/www/maven.apache.org/reference/plugins/vdoclet/</siteDirectory>
   <repository>
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/vdoclet/</connection>
diff --git a/war/project.xml b/war/project.xml
index 2d2bbf3b..a450714c 100644
--- a/war/project.xml
+++ b/war/project.xml
@@ -27,7 +27,7 @@
   <description>War Plugin for Maven</description>
   <shortDescription>War Plugin for Maven</shortDescription>
   <url>http://maven.apache.org/reference/plugins/war/</url>
-  <issueTrackingUrl>http://jira.codehaus.org/BrowseProject.jspa?id=10366</issueTrackingUrl>
+  <issueTrackingUrl>http://jira.codehaus.org/browse/MPWAR</issueTrackingUrl>
   <siteDirectory>/www/maven.apache.org/reference/plugins/war/</siteDirectory>
   <repository>
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/war/</connection>
diff --git a/webserver/project.xml b/webserver/project.xml
index aeef126a..fa9baa03 100644
--- a/webserver/project.xml
+++ b/webserver/project.xml
@@ -27,6 +27,7 @@
   <description/>
   <shortDescription>Manage web servers</shortDescription>
   <url>http://maven.apache.org/reference/plugins/webserver/</url>
+  <issueTrackingUrl>http://jira.codehaus.org/browse/MPWEBSERVER</issueTrackingUrl>
   <siteDirectory>/www/maven.apache.org/reference/plugins/webserver/</siteDirectory>
   <repository>
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/webserver/</connection>
diff --git a/wizard/project.xml b/wizard/project.xml
index 78ef232c..be22435c 100644
--- a/wizard/project.xml
+++ b/wizard/project.xml
@@ -26,7 +26,7 @@
   <currentVersion>1.1</currentVersion>
   <shortDescription>Wizard for Maven</shortDescription>
   <url>http://maven.apache.org/reference/plugins/wizard/</url>
-  <issueTrackingUrl>http://jira.codehaus.org/BrowseProject.jspa?id=10373</issueTrackingUrl>
+  <issueTrackingUrl>http://jira.codehaus.org/browse/MPWIZARD</issueTrackingUrl>
   <siteDirectory>/www/maven.apache.org/reference/plugins/wizard/</siteDirectory>
   <repository>
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/wizard/</connection>
diff --git a/xdoc/project.xml b/xdoc/project.xml
index aa8df281..4aac0d84 100644
--- a/xdoc/project.xml
+++ b/xdoc/project.xml
@@ -27,7 +27,7 @@
   <description>Convert xdocs into HTML. Requires Maven 1.0 RC2.</description>
   <shortDescription>Convert xdocs into HTML</shortDescription>
   <url>http://maven.apache.org/reference/plugins/xdoc/</url>
-  <issueTrackingUrl>http://jira.codehaus.org/BrowseProject.jspa?id=10355</issueTrackingUrl>
+  <issueTrackingUrl>http://jira.codehaus.org/browse/MPXDOC</issueTrackingUrl>
   <siteDirectory>/www/maven.apache.org/reference/plugins/xdoc/</siteDirectory>
   <repository>
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/xdoc/</connection>