diff --git a/cactus/src/plugin-resources/sample/project.xml b/cactus/src/plugin-resources/sample/project.xml
index 1e2d34ac..37fcd264 100644
--- a/cactus/src/plugin-resources/sample/project.xml
+++ b/cactus/src/plugin-resources/sample/project.xml
@@ -34,7 +34,7 @@
   <shortDescription>A sample project using the Cactus plugin for Maven</shortDescription>
 
   <!-- the project home page -->
-  <url>http://jakarta.apache.org/turbine/maven/</url>
+  <url>http://maven.apache.org/</url>
 
   <!-- the version control repository and http url for online access
        the connection element has the form:
diff --git a/examples/exampleejb-1.0/project.xml b/examples/exampleejb-1.0/project.xml
index d8e8210e..269bc414 100644
--- a/examples/exampleejb-1.0/project.xml
+++ b/examples/exampleejb-1.0/project.xml
@@ -20,12 +20,12 @@
   <description>
   </description>
 
-  <url>http://jakarta.apache.org/turbine/maven/</url>
-  <cvsWebUrl>http://cvs.apache.org/viewcvs/jakarta-turbine-maven/</cvsWebUrl>
+  <url>http://maven.apache.org/</url>
+  <cvsWebUrl>http://cvs.apache.org/viewcvs/maven/</cvsWebUrl>
   <issueTrackingUrl>http://nagoya.apache.org/scarab/servlet/scarab/</issueTrackingUrl>
   <siteAddress>jakarta.apache.org</siteAddress>
-  <siteDirectory>/www/jakarta.apache.org/turbine/maven/</siteDirectory>
-  <distributionDirectory>/www/jakarta.apache.org/builds/jakarta-turbine-maven/</distributionDirectory>
+  <siteDirectory>/www/maven.apache.org/</siteDirectory>
+  <distributionDirectory>/www/maven.apache.org/builds/</distributionDirectory>
 
   <cvsRoot>:pserver:anoncvs@cvs.apache.org:/home/cvspublic</cvsRoot>
   <cvsModule>jakarta-turbine-maven</cvsModule>
diff --git a/examples/plugin-script/project.xml b/examples/plugin-script/project.xml
index 60961b5d..d3e13a9b 100644
--- a/examples/plugin-script/project.xml
+++ b/examples/plugin-script/project.xml
@@ -36,7 +36,7 @@
   </shortDescription>
 
   <!-- the project home page -->
-  <url>http://jakarta.apache.org/turbine/maven/</url>
+  <url>http://maven.apache.org/</url>
 
   <!-- the version control repository and http url for online access
        the connection element has the form:
diff --git a/examples/project.xml b/examples/project.xml
index df88b726..3e73b7c9 100644
--- a/examples/project.xml
+++ b/examples/project.xml
@@ -21,14 +21,14 @@
 
   <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>org.apache.maven.examples</package>
-  <logo>http://jakarta.apache.org/turbine/maven/images/maven.jpg</logo>
+  <logo>http://maven.apache.org/images/maven.jpg</logo>
   <!-- a short description of what the project does -->
 
   <shortDescription>A collection of example projects showing how to use maven in different situations</shortDescription>
diff --git a/examples/simple-ear/project.xml b/examples/simple-ear/project.xml
index 68cb3935..d7f2c09a 100644
--- a/examples/simple-ear/project.xml
+++ b/examples/simple-ear/project.xml
@@ -34,14 +34,14 @@
   <shortDescription>A simple ear generating project</shortDescription>
 
   <!-- the project home page -->
-  <url>http://jakarta.apache.org/turbine/maven/</url>
+  <url>http://maven.apache.org/</url>
 
   <!-- the version control repository and http url for online access
        the connection element has the form:
        scm:<system>:<system specific connection string> -->
   <repository>
-    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:jakarta-turbine-maven</connection>
-    <url>http://cvs.apache.org/viewcvs/jakarta-turbine-maven/</url>
+    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven</connection>
+    <url>http://cvs.apache.org/viewcvs/maven/</url>
   </repository>
 
   <!-- any mailing lists for the project -->
diff --git a/examples/simple-java/project.xml b/examples/simple-java/project.xml
index cb378137..3dc67768 100644
--- a/examples/simple-java/project.xml
+++ b/examples/simple-java/project.xml
@@ -34,7 +34,7 @@
   <shortDescription>A simple java project</shortDescription>
 
   <!-- the project home page -->
-  <url>http://jakarta.apache.org/turbine/maven/</url>
+  <url>http://maven.apache.org/</url>
 
   <!-- the version control repository and http url for online access
        the connection element has the form:
diff --git a/examples/simple-webapp/project.xml b/examples/simple-webapp/project.xml
index faa76e99..406ef7f0 100644
--- a/examples/simple-webapp/project.xml
+++ b/examples/simple-webapp/project.xml
@@ -34,7 +34,7 @@
   <shortDescription>A simple web app project</shortDescription>
 
   <!-- the project home page -->
-  <url>http://jakarta.apache.org/turbine/maven/</url>
+  <url>http://maven.apache.org/</url>
 
   <!-- the version control repository and http url for online access
        the connection element has the form:
diff --git a/genapp/src/plugin-resources/src/pom/project.xml b/genapp/src/plugin-resources/src/pom/project.xml
index afda118e..3e5a89eb 100644
--- a/genapp/src/plugin-resources/src/pom/project.xml
+++ b/genapp/src/plugin-resources/src/pom/project.xml
@@ -35,11 +35,11 @@
   </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://nagoya.apache.org/scarab/servlet/scarab/</issueTrackingUrl>
   <siteAddress>jakarta.apache.org</siteAddress>
-  <siteDirectory>/www/jakarta.apache.org/turbine/maven/reference/plugins/examples/</siteDirectory>
-  <distributionDirectory>/www/jakarta.apache.org/builds/jakarta-turbine-maven/</distributionDirectory>
+  <siteDirectory>/www/maven.apache.org/reference/plugins/examples/</siteDirectory>
+  <distributionDirectory>/www/maven.apache.org/builds/</distributionDirectory>
 
   <!-- the version control repository and http url for online access
        the connection element has the form:
diff --git a/java/xdocs/properties.xml b/java/xdocs/properties.xml
index 94162103..d04223fb 100644
--- a/java/xdocs/properties.xml
+++ b/java/xdocs/properties.xml
@@ -195,7 +195,7 @@
 </build>
 ]]></source>
            section of your 
-           <a href="http://jakarta.apache.org/turbine/maven/reference/project-descriptor.html">
+           <a href="http://maven.apache.org/reference/project-descriptor.html">
            project descriptor</a>. If there are <code>includes</code> or <code>excludes</code>
            elements, this property will be set to true
           </td>
@@ -240,7 +240,7 @@
 </build>
 ]]></source>
             section of your
-            <a href="http://jakarta.apache.org/turbine/maven/reference/project-descriptor.html">
+            <a href="http://maven.apache.org/reference/project-descriptor.html">
             project descriptor</a>
           </td>
         </tr>
@@ -305,7 +305,7 @@
           <td>
             This property holds the Ant <code>path</code> of all the dependent jar
             files listed in the <code>dependencies</code> block of your 
-            <a href="http://jakarta.apache.org/turbine/maven/reference/project-descriptor.html">
+            <a href="http://maven.apache.org/reference/project-descriptor.html">
             project descriptor</a>
           </td>
         </tr>
diff --git a/xdoc/src/test-resources/navigation.xml b/xdoc/src/test-resources/navigation.xml
index 11b1f623..647afab8 100644
--- a/xdoc/src/test-resources/navigation.xml
+++ b/xdoc/src/test-resources/navigation.xml
@@ -5,7 +5,7 @@
 
   <body>
     <links>
-      <item name="Maven"  href="http://jakarta.apache.org/turbine/maven/"/>
+      <item name="Maven"  href="http://maven.apache.org/"/>
     </links>
     <menu>
       <item name="Alpha" href="/alpha/index.html">   
diff --git a/xdoc/src/test/project.xml b/xdoc/src/test/project.xml
index e78cb2e7..61681fa6 100644
--- a/xdoc/src/test/project.xml
+++ b/xdoc/src/test/project.xml
@@ -8,10 +8,10 @@
   <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>
+    <logo>http://maven.apache.org/images/jakarta-logo-blue.gif</logo>
   </organization>
   <inceptionYear>2001</inceptionYear>
-  <logo>http://jakarta.apache.org/turbine/maven/images/maven.jpg</logo>
+  <logo>http://maven.apache.org/images/maven.jpg</logo>
 
 
 </project>
diff --git a/xdoc/src/test/xdocs/navigation.xml b/xdoc/src/test/xdocs/navigation.xml
index c0496bfc..3a7c3344 100644
--- a/xdoc/src/test/xdocs/navigation.xml
+++ b/xdoc/src/test/xdocs/navigation.xml
@@ -5,7 +5,7 @@
 
   <body>
     <links>
-      <item name="Maven"  href="http://jakarta.apache.org/turbine/maven/"/>
+      <item name="Maven"  href="http://maven.apache.org/"/>
     </links>
     <menu>
       <item name="Alpha" href="/alpha/index.html">