diff --git a/antlr/project.xml b/antlr/project.xml
index a54ca3f8..cdb6e215 100644
--- a/antlr/project.xml
+++ b/antlr/project.xml
@@ -8,7 +8,7 @@
   <currentVersion>1.1</currentVersion>
   <description/>
   <shortDescription>Java Project Management Tools</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/antlr/</url>
+  <url>http://maven.apache.org/reference/plugins/antlr/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/antlr/</siteDirectory>
 
diff --git a/appserver/project.xml b/appserver/project.xml
index a2bf5212..650c3a1a 100644
--- a/appserver/project.xml
+++ b/appserver/project.xml
@@ -8,7 +8,7 @@
   <currentVersion>1.1</currentVersion>
   <description/>
   <shortDescription>A Maven plugin that can be used to install and control a J2EE application server instance.</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/appserver/</url>
+  <url>http://maven.apache.org/reference/plugins/appserver/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/appserver/</siteDirectory>
 
diff --git a/ashkelon/project.xml b/ashkelon/project.xml
index 101b0250..3a48270b 100644
--- a/ashkelon/project.xml
+++ b/ashkelon/project.xml
@@ -8,7 +8,7 @@
   <currentVersion>1.0</currentVersion>
   <description/>
   <shortDescription>Java Project Management Tools</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/ashkelon/</url>
+  <url>http://maven.apache.org/reference/plugins/ashkelon/</url>
   <package>org.apache.maven.ashkelon</package>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/linkcheck/</siteDirectory>
diff --git a/aspectj/project.xml b/aspectj/project.xml
index 40a8c41a..beaeebe3 100644
--- a/aspectj/project.xml
+++ b/aspectj/project.xml
@@ -8,7 +8,7 @@
   <currentVersion>1.1</currentVersion>
   <description/>
   <shortDescription>Eclipse Plugin for AspectJ</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/aspectj/</url>
+  <url>http://maven.apache.org/reference/plugins/aspectj/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/aspectj/</siteDirectory>
 
diff --git a/cactus/project.xml b/cactus/project.xml
index 79628e40..e30a8981 100644
--- a/cactus/project.xml
+++ b/cactus/project.xml
@@ -8,7 +8,7 @@
   <currentVersion>1.2</currentVersion>
   <description>Plugin for Cactus (http://jakarta.apache.org/cactus) that allows to automatically start containers, run Cactus tests and stop the containers.</description>
   <shortDescription>Cactus plugin</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/cactus/</url>
+  <url>http://maven.apache.org/reference/plugins/cactus/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/cactus/</siteDirectory>
 
diff --git a/castor/project.xml b/castor/project.xml
index 703f79d0..e66984cb 100644
--- a/castor/project.xml
+++ b/castor/project.xml
@@ -8,7 +8,7 @@
   <currentVersion>1.0</currentVersion>
   <description>Various goals for making development with Plexus easy.</description>
   <shortDescription>Plexus Tools</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/castor/</url>
+  <url>http://maven.apache.org/reference/plugins/castor/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/castor/</siteDirectory>
   
diff --git a/changelog/project.xml b/changelog/project.xml
index 2e8e603e..b116ba66 100644
--- a/changelog/project.xml
+++ b/changelog/project.xml
@@ -8,7 +8,7 @@
   <currentVersion>1.2</currentVersion>
   <description/>
   <shortDescription>Java Project Management Tools</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/changelog/</url>
+  <url>http://maven.apache.org/reference/plugins/changelog/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/changelog/</siteDirectory>
   
diff --git a/changes/project.xml b/changes/project.xml
index 0a305a55..6b3e6f35 100644
--- a/changes/project.xml
+++ b/changes/project.xml
@@ -8,7 +8,7 @@
   <currentVersion>1.2</currentVersion>
   <shortDescription>Java Project Management Tools</shortDescription>
   
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/changes/</url>
+  <url>http://maven.apache.org/reference/plugins/changes/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/changes/</siteDirectory>
   
diff --git a/checkstyle/project.xml b/checkstyle/project.xml
index 333a358b..281234fe 100644
--- a/checkstyle/project.xml
+++ b/checkstyle/project.xml
@@ -8,7 +8,7 @@
   <currentVersion>1.1</currentVersion>
   <description/>
   <shortDescription>Java Project Management Tools</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/checkstyle/</url>
+  <url>http://maven.apache.org/reference/plugins/checkstyle/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/checkstyle/</siteDirectory>
   
diff --git a/clover/project.xml b/clover/project.xml
index f5d6efad..2c91d158 100644
--- a/clover/project.xml
+++ b/clover/project.xml
@@ -8,7 +8,7 @@
   <currentVersion>1.2</currentVersion>
   <description/>
   <shortDescription>Java Project Management Tools</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/clover/</url>
+  <url>http://maven.apache.org/reference/plugins/clover/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/clover/</siteDirectory>
   
diff --git a/codeswitcher/project.xml b/codeswitcher/project.xml
index 5ad5bad8..a0e45700 100644
--- a/codeswitcher/project.xml
+++ b/codeswitcher/project.xml
@@ -8,13 +8,13 @@
   <currentVersion>1.0</currentVersion>
   <description/>
   <shortDescription>Java Project Management Tools</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/codeswitcher/</url>
+  <url>http://maven.apache.org/reference/plugins/codeswitcher/</url>
   <issueTrackingUrl>http://jira.werken.com/BrowseProject.jspa?id=10030</issueTrackingUrl>
   
   <siteAddress>jakarta.apache.org</siteAddress>
   <siteDirectory>/www/maven.apache.org/reference/plugins/codeswitcher/</siteDirectory>
   
-  <distributionDirectory>/www/jakarta.apache.org/builds/jakarta-turbine-maven/</distributionDirectory>
+  <distributionDirectory>/www/maven.apache.org/builds/</distributionDirectory>
   
   <repository>
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven/src/plugins-build/codeswitcher/</connection>
diff --git a/console/project.xml b/console/project.xml
index 36aca61f..a849791d 100644
--- a/console/project.xml
+++ b/console/project.xml
@@ -7,13 +7,13 @@
   <name>Maven Console Plug-in</name>
   <currentVersion>1.0</currentVersion>
   <shortDescription>Console for Maven</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/console/</url>
+  <url>http://maven.apache.org/reference/plugins/console/</url>
   <issueTrackingUrl>http://jira.werken.com/BrowseProject.jspa?id=10030</issueTrackingUrl>
   
   <siteAddress>jakarta.apache.org</siteAddress>
   <siteDirectory>/www/maven.apache.org/reference/plugins/console/</siteDirectory>
   
-  <distributionDirectory>/www/jakarta.apache.org/builds/jakarta-turbine-maven/</distributionDirectory>
+  <distributionDirectory>/www/maven.apache.org/builds/</distributionDirectory>
   
   <repository>
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven/src/plugins-build/console/</connection>
diff --git a/deploy/project.xml b/deploy/project.xml
index 53e3452e..65f3ae06 100644
--- a/deploy/project.xml
+++ b/deploy/project.xml
@@ -8,7 +8,7 @@
   <currentVersion>1.1</currentVersion>
   <description/>
   <shortDescription>Java Project Management Tools</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/deploy/</url>
+  <url>http://maven.apache.org/reference/plugins/deploy/</url>
   
   <siteDirectory>/www/maven.apache.org/reference/plugins/deploy/</siteDirectory>
   
diff --git a/developer-activity/project.xml b/developer-activity/project.xml
index a5442bf0..55d6ac15 100644
--- a/developer-activity/project.xml
+++ b/developer-activity/project.xml
@@ -9,7 +9,7 @@
   <description>This document provides a report of activity in terms of CVS commits and breaks it out by developer.</description>
   <shortDescription/>
 
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/developer-activity/</url>
+  <url>http://maven.apache.org/reference/plugins/developer-activity/</url>
   
   <siteDirectory>/www/maven.apache.org/reference/plugins/developer-activity/</siteDirectory>
 
diff --git a/dist/project.xml b/dist/project.xml
index 427da680..59f61e67 100644
--- a/dist/project.xml
+++ b/dist/project.xml
@@ -7,7 +7,7 @@
   <name>Maven Distribution Plug-in</name>
   <currentVersion>1.2</currentVersion>
   <shortDescription>Java Project Management Tools</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/dist/</url>
+  <url>http://maven.apache.org/reference/plugins/dist/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/dist/</siteDirectory>
 
diff --git a/docbook/project.xml b/docbook/project.xml
index d13a10f8..d478029a 100644
--- a/docbook/project.xml
+++ b/docbook/project.xml
@@ -7,7 +7,7 @@
   <name>Maven DocBook Plug-in</name>
   <currentVersion>1.0</currentVersion>
   <shortDescription>Java Project Management Tools</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/docbook/</url>
+  <url>http://maven.apache.org/reference/plugins/docbook/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/docbook/</siteDirectory>
 
diff --git a/ear/project.xml b/ear/project.xml
index 83059d95..9c759227 100644
--- a/ear/project.xml
+++ b/ear/project.xml
@@ -8,7 +8,7 @@
   <currentVersion>1.0</currentVersion>
   <description>Ear Plugin for Maven</description>
   <shortDescription>Ear Plugin for Maven</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/ear/</url>
+  <url>http://maven.apache.org/reference/plugins/ear/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/ear/</siteDirectory>
 
diff --git a/eclipse/project.xml b/eclipse/project.xml
index 5ac5ab58..722fefc2 100644
--- a/eclipse/project.xml
+++ b/eclipse/project.xml
@@ -8,7 +8,7 @@
   <currentVersion>1.2</currentVersion>
   <description>A plugin to generate various files for the Eclipse IDE and ease the use of Maven within that environment</description>
   <shortDescription>Eclipse Plugin for Maven</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/eclipse/</url>
+  <url>http://maven.apache.org/reference/plugins/eclipse/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/eclipse/</siteDirectory>
 
diff --git a/ejb/project.xml b/ejb/project.xml
index 410594c4..9d3a5ffb 100644
--- a/ejb/project.xml
+++ b/ejb/project.xml
@@ -8,7 +8,7 @@
   <currentVersion>1.0</currentVersion>
   <description>EJB Plugin for Maven</description>
   <shortDescription>EJB Plugin for Maven</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/ejb/</url>
+  <url>http://maven.apache.org/reference/plugins/ejb/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/ejb/</siteDirectory>
 
diff --git a/examples/project.xml b/examples/project.xml
index 17c663ff..df88b726 100644
--- a/examples/project.xml
+++ b/examples/project.xml
@@ -34,11 +34,11 @@
   <shortDescription>A collection of example projects showing how to use maven in different situations</shortDescription>
   <!-- the project home page -->
 
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/examples/</url>
+  <url>http://maven.apache.org/reference/plugins/examples/</url>
   <issueTrackingUrl>http://jira.werken.com/BrowseProject.jspa?id=10030</issueTrackingUrl>
   <siteAddress>jakarta.apache.org</siteAddress>
   <siteDirectory>/www/maven.apache.org/reference/plugins/examples/</siteDirectory>
-  <distributionDirectory>/www/jakarta.apache.org/builds/jakarta-turbine-maven/</distributionDirectory>
+  <distributionDirectory>/www/maven.apache.org/builds/</distributionDirectory>
   <!-- the version control repository and http url for online access
        the connection element has the form:
        scm:<system>:<system specific connection string> -->
diff --git a/faq/project.xml b/faq/project.xml
index 31732eb8..c0083639 100644
--- a/faq/project.xml
+++ b/faq/project.xml
@@ -11,7 +11,7 @@
   <gumpRepositoryId>jakarta</gumpRepositoryId>
   <description>Creates XDoc documentation from an FAQ XML document.</description>
   <shortDescription/>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/faq/</url>
+  <url>http://maven.apache.org/reference/plugins/faq/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/faq/</siteDirectory>
 
diff --git a/file-activity/project.xml b/file-activity/project.xml
index d123287d..337e0146 100644
--- a/file-activity/project.xml
+++ b/file-activity/project.xml
@@ -11,7 +11,7 @@
   <gumpRepositoryId>jakarta</gumpRepositoryId>
   <description>This document provides a report of activity in terms of CVS commits and breaks it out by file.</description>
   <shortDescription/>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/file-activity/</url>
+  <url>http://maven.apache.org/reference/plugins/file-activity/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/file-activity/</siteDirectory>
 
diff --git a/genapp/project.xml b/genapp/project.xml
index 4324c9a0..50d13713 100644
--- a/genapp/project.xml
+++ b/genapp/project.xml
@@ -20,7 +20,7 @@
   <shortDescription>A collection of example projects showing how to use maven in different situations</shortDescription>
   <!-- the project home page -->
 
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/genapp/</url>
+  <url>http://maven.apache.org/reference/plugins/genapp/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/genapp/</siteDirectory>
 
diff --git a/genapp/src/plugin-resources/src/pom/project.xml b/genapp/src/plugin-resources/src/pom/project.xml
index 443ba2ed..afda118e 100644
--- a/genapp/src/plugin-resources/src/pom/project.xml
+++ b/genapp/src/plugin-resources/src/pom/project.xml
@@ -17,14 +17,14 @@
   <!-- details about the organization that 'owns' the project -->
   <organization>
     <name>Apache Software Foundation</name>
-    <url>http://jakarta.apache.org/</url>
-    <logo>http://jakarta.apache.org/turbine/maven/images/jakarta-logo-blue.gif</logo>
+    <url>http://www.apache.org/</url>
+    <logo>http://maven.apache.org/images/jakarta-logo-blue.gif</logo>
   </organization>
   
   <!-- the year the project started -->
   <inceptionYear>2002</inceptionYear>
   <package>@PACKAGE@</package>
-  <logo>http://jakarta.apache.org/turbine/maven/images/maven.jpg</logo>
+  <logo>http://maven.apache.org/images/maven.jpg</logo>
   <description>
     A collection of example projects showing how to use maven in different
     situations   
diff --git a/gump/project.xml b/gump/project.xml
index 914d739e..94577e46 100644
--- a/gump/project.xml
+++ b/gump/project.xml
@@ -8,7 +8,7 @@
   <currentVersion>1.1</currentVersion>
   <description/>
   <shortDescription>Java Project Management Tools</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/gump/</url>
+  <url>http://maven.apache.org/reference/plugins/gump/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/gump/</siteDirectory>
 
diff --git a/html2xdoc/project.xml b/html2xdoc/project.xml
index 4f47a66c..4701cd2a 100644
--- a/html2xdoc/project.xml
+++ b/html2xdoc/project.xml
@@ -11,7 +11,7 @@
   <gumpRepositoryId>jakarta</gumpRepositoryId>
   <description>Creates XDoc documentation from normal HTML documentation.</description>
   <shortDescription/>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/html2xdoc/</url>
+  <url>http://maven.apache.org/reference/plugins/html2xdoc/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/html2xdoc/</siteDirectory>
 
diff --git a/idea/project.xml b/idea/project.xml
index bf087f51..233e0dca 100644
--- a/idea/project.xml
+++ b/idea/project.xml
@@ -7,7 +7,7 @@
   <name>Maven IDEA Plug-in</name>
   <currentVersion>1.2-SNAPSHOT</currentVersion>
   <shortDescription>IDEA Plugin for Maven</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/idea/</url>
+  <url>http://maven.apache.org/reference/plugins/idea/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/idea/</siteDirectory>
 
diff --git a/j2ee/project.xml b/j2ee/project.xml
index 0001a539..7bc8553f 100644
--- a/j2ee/project.xml
+++ b/j2ee/project.xml
@@ -8,7 +8,7 @@
   <currentVersion>1.1</currentVersion>
   <description/>
   <shortDescription>Java Project Management Tools</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/j2ee/</url>
+  <url>http://maven.apache.org/reference/plugins/j2ee/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/j2ee/</siteDirectory>
 
diff --git a/jalopy/project.xml b/jalopy/project.xml
index 9ebfde71..a0f4cc00 100644
--- a/jalopy/project.xml
+++ b/jalopy/project.xml
@@ -8,7 +8,7 @@
   <currentVersion>1.0</currentVersion>
   <description/>
   <shortDescription>Java Project Management Tools</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/jalopy/</url>
+  <url>http://maven.apache.org/reference/plugins/jalopy/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/jalopy/</siteDirectory>
 
diff --git a/java/project.xml b/java/project.xml
index 37943ea9..3e655345 100644
--- a/java/project.xml
+++ b/java/project.xml
@@ -8,7 +8,7 @@
   <currentVersion>1.3-SNAPSHOT</currentVersion>
   <description/>
   <shortDescription>Java Project Management Tools</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/java/</url>
+  <url>http://maven.apache.org/reference/plugins/java/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/java/</siteDirectory>
 
diff --git a/javadoc/project.xml b/javadoc/project.xml
index d5e9f240..e617a362 100644
--- a/javadoc/project.xml
+++ b/javadoc/project.xml
@@ -8,7 +8,7 @@
   <currentVersion>1.1</currentVersion>
   <description/>
   <shortDescription>Java Project Management Tools</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/javadoc/</url>
+  <url>http://maven.apache.org/reference/plugins/javadoc/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/javadoc/</siteDirectory>
 
diff --git a/jbuilder/project.xml b/jbuilder/project.xml
index 5b730039..efdb953d 100644
--- a/jbuilder/project.xml
+++ b/jbuilder/project.xml
@@ -8,7 +8,7 @@
   <currentVersion>1.1</currentVersion>
   <description/>
   <shortDescription>JBuilder Plugin for Maven</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/jbuilder/</url>
+  <url>http://maven.apache.org/reference/plugins/jbuilder/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/jbuilder/</siteDirectory>
 
diff --git a/jdepend/project.xml b/jdepend/project.xml
index 507522d6..ed354036 100644
--- a/jdepend/project.xml
+++ b/jdepend/project.xml
@@ -8,7 +8,7 @@
   <currentVersion>1.2</currentVersion>
   <description/>
   <shortDescription>Java Project Management Tools</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/jdepend/</url>
+  <url>http://maven.apache.org/reference/plugins/jdepend/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/jdepend/</siteDirectory>
 
diff --git a/jdeveloper/project.xml b/jdeveloper/project.xml
index a5e95832..19855357 100644
--- a/jdeveloper/project.xml
+++ b/jdeveloper/project.xml
@@ -9,7 +9,7 @@
   <inceptionYear>2002</inceptionYear>
   <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://jakarta.apache.org/turbine/maven/reference/plugins/jdeveloper/</url>
+  <url>http://maven.apache.org/reference/plugins/jdeveloper/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/jdeveloper/</siteDirectory>
 
diff --git a/jdiff/project.xml b/jdiff/project.xml
index 698404e0..0f27941c 100644
--- a/jdiff/project.xml
+++ b/jdiff/project.xml
@@ -8,7 +8,7 @@
   <currentVersion>1.0</currentVersion>
   <description/>
   <shortDescription>Java Project Management Tools</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/jdiff/</url>
+  <url>http://maven.apache.org/reference/plugins/jdiff/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/jdiff/</siteDirectory>
 
diff --git a/jellydoc/project.xml b/jellydoc/project.xml
index a9b44e4a..11c985ab 100644
--- a/jellydoc/project.xml
+++ b/jellydoc/project.xml
@@ -11,7 +11,7 @@
   <gumpRepositoryId>jakarta</gumpRepositoryId>
   <description>Creates a JavaDoc like report for any Jelly Tags used in a project.</description>
   <shortDescription/>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/jellydoc/</url>
+  <url>http://maven.apache.org/reference/plugins/jellydoc/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/jellydoc/</siteDirectory>
 
diff --git a/jnlp/project.xml b/jnlp/project.xml
index 24a3806c..eedac7df 100644
--- a/jnlp/project.xml
+++ b/jnlp/project.xml
@@ -7,7 +7,7 @@
   <name>Maven JNLP Plug-in</name>
   <currentVersion>1.0</currentVersion>
   <shortDescription>JNLP Plugin for Maven</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/jnlp/</url>
+  <url>http://maven.apache.org/reference/plugins/jnlp/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/jnlp/</siteDirectory>
 
diff --git a/junit-report/project.xml b/junit-report/project.xml
index d5eb0ae0..77d2314d 100644
--- a/junit-report/project.xml
+++ b/junit-report/project.xml
@@ -8,7 +8,7 @@
   <currentVersion>1.2</currentVersion>
   <description/>
   <shortDescription>Java Project Management Tools</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/junit-report/</url>
+  <url>http://maven.apache.org/reference/plugins/junit-report/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/junit-report/</siteDirectory>
 
diff --git a/junitdoclet/project.xml b/junitdoclet/project.xml
index 5d6b0736..afcc1b9f 100644
--- a/junitdoclet/project.xml
+++ b/junitdoclet/project.xml
@@ -8,7 +8,7 @@
   <currentVersion>1.0</currentVersion>
   <description>A plugin to generate test cases use JUnitDoclet</description>
   <shortDescription>JUnitDoclet test generator</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/junitdoclet/</url>
+  <url>http://maven.apache.org/reference/plugins/junitdoclet/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/junitdoclet/</siteDirectory>
 
diff --git a/jxr/project.xml b/jxr/project.xml
index d4f27d86..2f963def 100644
--- a/jxr/project.xml
+++ b/jxr/project.xml
@@ -8,7 +8,7 @@
   <currentVersion>1.1</currentVersion>
   <description/>
   <shortDescription>Java Project Management Tools</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/jxr/</url>
+  <url>http://maven.apache.org/reference/plugins/jxr/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/jxr/</siteDirectory>
 
diff --git a/latex/project.xml b/latex/project.xml
index 0d00b961..013e9432 100644
--- a/latex/project.xml
+++ b/latex/project.xml
@@ -8,7 +8,7 @@
   <currentVersion>1.0</currentVersion>
   <description/>
   <shortDescription>Java Project Management Tools</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/latex/</url>
+  <url>http://maven.apache.org/reference/plugins/latex/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/latex/</siteDirectory>
 
diff --git a/latka/project.xml b/latka/project.xml
index 660bfaf9..e200fb2a 100644
--- a/latka/project.xml
+++ b/latka/project.xml
@@ -8,7 +8,7 @@
   <currentVersion>1.2-SNAPSHOT</currentVersion>
   <description/>
   <shortDescription>Java Project Management Tools</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/latka/</url>
+  <url>http://maven.apache.org/reference/plugins/latka/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/latka/</siteDirectory>
 
diff --git a/license/project.xml b/license/project.xml
index 4ad304b0..c3ccd7c0 100644
--- a/license/project.xml
+++ b/license/project.xml
@@ -8,7 +8,7 @@
   <currentVersion>1.0</currentVersion>
   <description/>
   <shortDescription>Java Project Management Tools</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/license/</url>
+  <url>http://maven.apache.org/reference/plugins/license/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/license/</siteDirectory>
 
diff --git a/linkcheck/project.xml b/linkcheck/project.xml
index d55fb1c8..40b2bc84 100644
--- a/linkcheck/project.xml
+++ b/linkcheck/project.xml
@@ -8,7 +8,7 @@
   <currentVersion>1.0</currentVersion>
   <description/>
   <shortDescription>Java Project Management Tools</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/linkcheck/</url>
+  <url>http://maven.apache.org/reference/plugins/linkcheck/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/linkcheck/</siteDirectory>
 
diff --git a/pdf/project.xml b/pdf/project.xml
index ea3cd088..5c4e19ee 100644
--- a/pdf/project.xml
+++ b/pdf/project.xml
@@ -8,7 +8,7 @@
   <currentVersion>1.1-SNAPSHOT</currentVersion>
   <description/>
   <shortDescription>Java Project Management Tools</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/pdf/</url>
+  <url>http://maven.apache.org/reference/plugins/pdf/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/pdf/</siteDirectory>
 
diff --git a/perforce/project.xml b/perforce/project.xml
index 08b3f30b..ad006716 100644
--- a/perforce/project.xml
+++ b/perforce/project.xml
@@ -8,10 +8,9 @@
   <currentVersion>1.1</currentVersion>
   <inceptionYear>2001</inceptionYear>
   <package>org.apache.maven</package>
-  <logo>http://jakarta.apache.org/turbine/maven/images/maven.jpg</logo>
   <description/>
   <shortDescription>Java Project Management Tools</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/perforce/</url>
+  <url>http://maven.apache.org/reference/plugins/perforce/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/perforce/</siteDirectory>
 
diff --git a/plugin/project.xml b/plugin/project.xml
index 4bea1d90..6918411a 100644
--- a/plugin/project.xml
+++ b/plugin/project.xml
@@ -8,7 +8,7 @@
   <currentVersion>1.0</currentVersion>
   <description/>
   <shortDescription>Maven Plugin plugin</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/plugin/</url>
+  <url>http://maven.apache.org/reference/plugins/plugin/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/plugin/</siteDirectory>
 
diff --git a/pom/project.xml b/pom/project.xml
index 51b98cb2..cc17f7c3 100644
--- a/pom/project.xml
+++ b/pom/project.xml
@@ -8,7 +8,7 @@
   <currentVersion>1.2</currentVersion>
   <description/>
   <shortDescription>Java Project Management Tools</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/pom/</url>
+  <url>http://maven.apache.org/reference/plugins/pom/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/pom/</siteDirectory>
 
diff --git a/project.xml b/project.xml
index d6cb3a52..6398e0c8 100644
--- a/project.xml
+++ b/project.xml
@@ -8,22 +8,22 @@
   <currentVersion>1.0</currentVersion>
   <organization>
     <name>Apache Software Foundation</name>
-    <url>http://jakarta.apache.org/</url>
-    <logo>http://jakarta.apache.org/turbine/maven/images/jakarta-logo-blue.gif</logo>
+    <url>http://www.apache.org/</url>
+    <logo>http://maven.apache.org/images/jakarta-logo-blue.gif</logo>
   </organization>
   <inceptionYear>2001</inceptionYear>
   <package>org.apache.maven</package>
-  <logo>http://jakarta.apache.org/turbine/maven/images/maven.jpg</logo>
+  <logo>http://maven.apache.org/images/maven.jpg</logo>
 
   <issueTrackingUrl>http://jira.werken.com/BrowseProject.jspa?id=10030</issueTrackingUrl>
-  <siteAddress>jakarta.apache.org</siteAddress>
+  <siteAddress>maven.apache.org</siteAddress>
 
-  <distributionDirectory>/www/jakarta.apache.org/builds/jakarta-turbine-maven/</distributionDirectory>
+  <distributionDirectory>/www/maven.apache.org/builds/</distributionDirectory>
 
 
   <repository>
-    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:jakarta-turbine-maven/src/plugins-build/plexus/</connection>
-    <url>http://cvs.apache.org/viewcvs/jakarta-turbine-maven/src/plugins-build/plexus/</url>
+    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven/src/plugins-build/plexus/</connection>
+    <url>http://cvs.apache.org/viewcvs/maven/src/plugins-build/plexus/</url>
   </repository>
 
   <build>
diff --git a/release/project.xml b/release/project.xml
index 9680f656..ab81af8c 100644
--- a/release/project.xml
+++ b/release/project.xml
@@ -8,7 +8,7 @@
   <currentVersion>1.0</currentVersion>
   <description/>
   <shortDescription>Java Project Management Tools</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/deploy/</url>
+  <url>http://maven.apache.org/reference/plugins/deploy/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/deploy/</siteDirectory>
 
diff --git a/repository/project.xml b/repository/project.xml
index f6c6157e..a9897300 100644
--- a/repository/project.xml
+++ b/repository/project.xml
@@ -8,11 +8,11 @@
   <currentVersion>1.0-SNAPSHOT</currentVersion>
   <shortDescription>Tools to work with the central repo</shortDescription>
   
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/repository/</url>
+  <url>http://maven.apache.org/reference/plugins/repository/</url>
   
   <siteDirectory>/www/maven.apache.org/reference/plugins/repository/</siteDirectory>
   
-  <distributionDirectory>/www/jakarta.apache.org/builds/jakarta-turbine-maven/</distributionDirectory>
+  <distributionDirectory>/www/maven.apache.org/builds/</distributionDirectory>
 
   <repository>
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven/src/plugins-build/repository/</connection>
diff --git a/sea/project.xml b/sea/project.xml
index 8d0c262f..84b25f10 100644
--- a/sea/project.xml
+++ b/sea/project.xml
@@ -8,7 +8,7 @@
   <currentVersion>1.0</currentVersion>
   <description/>
   <shortDescription>Java Project Management Tools</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/deploy/</url>
+  <url>http://maven.apache.org/reference/plugins/deploy/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/deploy/</siteDirectory>
 
diff --git a/shell/project.xml b/shell/project.xml
index 4624bf5c..dc9ad1a5 100644
--- a/shell/project.xml
+++ b/shell/project.xml
@@ -8,7 +8,7 @@
   <currentVersion>1.0</currentVersion>
   <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://jakarta.apache.org/turbine/maven/reference/plugins/shell/</url>
+  <url>http://maven.apache.org/reference/plugins/shell/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/shell/</siteDirectory>
 
diff --git a/site/project.xml b/site/project.xml
index 9f5cf7b2..56ea8e93 100644
--- a/site/project.xml
+++ b/site/project.xml
@@ -8,7 +8,7 @@
   <currentVersion>1.1</currentVersion>
   <description/>
   <shortDescription>Java Project Management Tools</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/site/</url>
+  <url>http://maven.apache.org/reference/plugins/site/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/site/</siteDirectory>
 
diff --git a/statcvs/project.xml b/statcvs/project.xml
index 0ad19a4d..f66d480d 100644
--- a/statcvs/project.xml
+++ b/statcvs/project.xml
@@ -8,7 +8,7 @@
   <currentVersion>1.1</currentVersion>
   <description/>
   <shortDescription>Provides CVS statistics</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/statcvs/</url>
+  <url>http://maven.apache.org/reference/plugins/statcvs/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/statcvs/</siteDirectory>
 
diff --git a/struts/project.xml b/struts/project.xml
index 4690e238..99eed9bf 100644
--- a/struts/project.xml
+++ b/struts/project.xml
@@ -8,7 +8,7 @@
   <currentVersion>1.1</currentVersion>
   <description/>
   <shortDescription>Java Project Management Tools</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/struts/</url>
+  <url>http://maven.apache.org/reference/plugins/struts/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/struts/</siteDirectory>
 
diff --git a/summit/project.xml b/summit/project.xml
index 93443c2f..fb66d287 100644
--- a/summit/project.xml
+++ b/summit/project.xml
@@ -9,7 +9,7 @@
   <description>Various goals for making development with Plexus easy.</description>
   <shortDescription>Plexus Tools</shortDescription>
   
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/summit/</url>
+  <url>http://maven.apache.org/reference/plugins/summit/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/summit/</siteDirectory>
 
diff --git a/tasklist/project.xml b/tasklist/project.xml
index 5cfed7ad..8d09b84a 100644
--- a/tasklist/project.xml
+++ b/tasklist/project.xml
@@ -8,7 +8,7 @@
   <currentVersion>2.0</currentVersion>
   <description/>
   <shortDescription>Java Project Management Tools</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/tasklist/</url>
+  <url>http://maven.apache.org/reference/plugins/tasklist/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/tasklist/</siteDirectory>
 
diff --git a/test/project.xml b/test/project.xml
index 6d0bb541..d83ffc9f 100644
--- a/test/project.xml
+++ b/test/project.xml
@@ -8,7 +8,7 @@
   <currentVersion>1.2</currentVersion>
   <description/>
   <shortDescription>Java Project Management Tools</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/test/</url>
+  <url>http://maven.apache.org/reference/plugins/test/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/test/</siteDirectory>
 
diff --git a/torque/project.xml b/torque/project.xml
index 2f3bc052..88168312 100644
--- a/torque/project.xml
+++ b/torque/project.xml
@@ -7,7 +7,7 @@
   <currentVersion>3.1</currentVersion>
   <description>Maven Plugin for Torque</description>
   <shortDescription>Maven Plugin for Torque</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/torque/</url>
+  <url>http://maven.apache.org/reference/plugins/torque/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/torque/</siteDirectory>
 
diff --git a/touchstone-partner/project.xml b/touchstone-partner/project.xml
index 4eec3fc7..77e9851b 100644
--- a/touchstone-partner/project.xml
+++ b/touchstone-partner/project.xml
@@ -8,7 +8,7 @@
   <currentVersion>1.0</currentVersion>
   <description/>
   <shortDescription>Java Project Management Tools</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/touchstone-partner/</url>
+  <url>http://maven.apache.org/reference/plugins/touchstone-partner/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/touchstone-partner/</siteDirectory>
 
diff --git a/touchstone/project.xml b/touchstone/project.xml
index 0f41683c..500f9e68 100644
--- a/touchstone/project.xml
+++ b/touchstone/project.xml
@@ -8,7 +8,7 @@
   <currentVersion>1.0</currentVersion>
   <description/>
   <shortDescription>Java Project Management Tools</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/touchstone/</url>
+  <url>http://maven.apache.org/reference/plugins/touchstone/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/touchstone/</siteDirectory>
 
diff --git a/uberjar/project.xml b/uberjar/project.xml
index f9c31710..54fd0e66 100644
--- a/uberjar/project.xml
+++ b/uberjar/project.xml
@@ -20,7 +20,7 @@
   <shortDescription>Uberjar packages your project as well as its dependencies into a single jar file. In addition, bootstrap code is added that enables a main class to be invoked by simply typing: java -jar your.jar</shortDescription>
   <!-- the project home page -->
 
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/uberjar/</url>
+  <url>http://maven.apache.org/reference/plugins/uberjar/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/uberjar/</siteDirectory>
 
diff --git a/vdoclet/project.xml b/vdoclet/project.xml
index ec1ddda7..f3815204 100644
--- a/vdoclet/project.xml
+++ b/vdoclet/project.xml
@@ -11,7 +11,7 @@
     source code using velocity driven templates
   </description>
   <shortDescription>VDoclet plugin for Maven</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/vdoclet/</url>
+  <url>http://maven.apache.org/reference/plugins/vdoclet/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/vdoclet/</siteDirectory>
 
diff --git a/war/project.xml b/war/project.xml
index 737dd208..fd9b0b94 100644
--- a/war/project.xml
+++ b/war/project.xml
@@ -8,7 +8,7 @@
   <currentVersion>1.2</currentVersion>
   <description>War Plugin for Maven</description>
   <shortDescription>War Plugin for Maven</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/war/</url>
+  <url>http://maven.apache.org/reference/plugins/war/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/war/</siteDirectory>
 
diff --git a/webserver/project.xml b/webserver/project.xml
index e2ce0e44..db93a6ba 100644
--- a/webserver/project.xml
+++ b/webserver/project.xml
@@ -8,7 +8,7 @@
   <currentVersion>1.1</currentVersion>
   <description/>
   <shortDescription>Java Project Management Tools</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/webserver/</url>
+  <url>http://maven.apache.org/reference/plugins/webserver/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/webserver/</siteDirectory>
 
diff --git a/wizard/project.xml b/wizard/project.xml
index b1651dae..f8ad9119 100644
--- a/wizard/project.xml
+++ b/wizard/project.xml
@@ -7,7 +7,7 @@
   <name>Maven Wizard Plug-in</name>
   <currentVersion>1.0</currentVersion>
   <shortDescription>Wizard for Maven</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/wizard/</url>
+  <url>http://maven.apache.org/reference/plugins/wizard/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/wizard/</siteDirectory>
 
diff --git a/word2html/project.xml b/word2html/project.xml
index d42b17a1..2ff6a485 100644
--- a/word2html/project.xml
+++ b/word2html/project.xml
@@ -8,7 +8,7 @@
   <currentVersion>1.2</currentVersion>
   <description>A Maven plugin to convert word docs into html for project usage</description>
   <shortDescription>Convert Word docs to HTML</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/word2html/</url>
+  <url>http://maven.apache.org/reference/plugins/word2html/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/word2html/</siteDirectory>
 
diff --git a/xdoc/project.xml b/xdoc/project.xml
index 4e20b8bd..d76aa812 100644
--- a/xdoc/project.xml
+++ b/xdoc/project.xml
@@ -7,7 +7,7 @@
   <name>Maven XDoc Plug-in</name>
   <currentVersion>1.3</currentVersion>
   <shortDescription>Java Project Management Tools</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/xdoc/</url>
+  <url>http://maven.apache.org/reference/plugins/xdoc/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/xdoc/</siteDirectory>