diff --git a/ant/project.xml b/ant/project.xml
index 12f09d44..595c0b30 100644
--- a/ant/project.xml
+++ b/ant/project.xml
@@ -12,8 +12,8 @@
   <issueTrackingUrl>http://jira.werken.com/BrowseProject.jspa?id=10030</issueTrackingUrl>
   <siteDirectory>/www/maven.apache.org/reference/plugins/ant/</siteDirectory>
   <repository>
-    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven/src/plugins-build/ant/</connection>
-    <url>http://cvs.apache.org/viewcvs/maven/src/plugins-build/ant/</url>
+    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/ant/</connection>
+    <url>http://cvs.apache.org/viewcvs/maven-plugins/ant/</url>
   </repository>
   
   <versions>
diff --git a/ant/src/plugin-test/project.xml b/ant/src/plugin-test/project.xml
index a13694f3..c0a42827 100644
--- a/ant/src/plugin-test/project.xml
+++ b/ant/src/plugin-test/project.xml
@@ -19,8 +19,8 @@
   <url>http://maven.apache.org/reference/plugins/ant/</url>
   <siteDirectory>/www/maven.apache.org/reference/plugins/ant/</siteDirectory>
   <repository>
-    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven/src/plugins-build/ant/</connection>
-    <url>http://cvs.apache.org/viewcvs/maven/src/plugins-build/ant/</url>
+    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/ant/</connection>
+    <url>http://cvs.apache.org/viewcvs/maven-plugins/ant/</url>
   </repository>
   <developers>
     <developer>
diff --git a/antlr/project.xml b/antlr/project.xml
index 255ded31..55c49558 100644
--- a/antlr/project.xml
+++ b/antlr/project.xml
@@ -11,8 +11,8 @@
   <url>http://maven.apache.org/reference/plugins/antlr/</url>
   <siteDirectory>/www/maven.apache.org/reference/plugins/antlr/</siteDirectory>
   <repository>
-    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven/src/plugins-build/antlr/</connection>
-    <url>http://cvs.apache.org/viewcvs/maven/src/plugins-build/antlr/</url>
+    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/antlr/</connection>
+    <url>http://cvs.apache.org/viewcvs/maven-plugins/antlr/</url>
   </repository>
   <developers>
     <developer>
diff --git a/appserver/project.xml b/appserver/project.xml
index b207936f..ff1d4979 100644
--- a/appserver/project.xml
+++ b/appserver/project.xml
@@ -11,8 +11,8 @@
   <url>http://maven.apache.org/reference/plugins/appserver/</url>
   <siteDirectory>/www/maven.apache.org/reference/plugins/appserver/</siteDirectory>
   <repository>
-    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven/src/plugins-build/appserver/</connection>
-    <url>http://cvs.apache.org/viewcvs/maven/src/plugins-build/appserver/</url>
+    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/appserver/</connection>
+    <url>http://cvs.apache.org/viewcvs/maven-plugins/appserver/</url>
   </repository>
   <developers>
     <developer>
diff --git a/ashkelon/project.xml b/ashkelon/project.xml
index 2cd57a0b..c9dd82cc 100644
--- a/ashkelon/project.xml
+++ b/ashkelon/project.xml
@@ -12,8 +12,8 @@
   <package>org.apache.maven.ashkelon</package>
   <siteDirectory>/www/maven.apache.org/reference/plugins/ashkelon/</siteDirectory>
   <repository>
-    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven/src/plugins-build/ashkelon/</connection>
-    <url>http://cvs.apache.org/viewcvs/maven/src/plugins-build/ashkelon/</url>
+    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/ashkelon/</connection>
+    <url>http://cvs.apache.org/viewcvs/maven-plugins/ashkelon/</url>
   </repository>
   <developers/>
   <dependencies>
diff --git a/aspectj/project.xml b/aspectj/project.xml
index 91459fcb..2195fdfb 100644
--- a/aspectj/project.xml
+++ b/aspectj/project.xml
@@ -11,8 +11,8 @@
   <url>http://maven.apache.org/reference/plugins/aspectj/</url>
   <siteDirectory>/www/maven.apache.org/reference/plugins/aspectj/</siteDirectory>
   <repository>
-    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven/src/plugins-build/aspectj/</connection>
-    <url>http://cvs.apache.org/viewcvs/maven/src/plugins-build/aspectj/</url>
+    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/aspectj/</connection>
+    <url>http://cvs.apache.org/viewcvs/maven-plugins/aspectj/</url>
   </repository>
   <versions>
     <version>
diff --git a/cactus/project.xml b/cactus/project.xml
index 62b38d76..e2fe9c7f 100644
--- a/cactus/project.xml
+++ b/cactus/project.xml
@@ -11,8 +11,8 @@
   <url>http://maven.apache.org/reference/plugins/cactus/</url>
   <siteDirectory>/www/maven.apache.org/reference/plugins/cactus/</siteDirectory>
   <repository>
-    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven/src/plugins-build/cactus/</connection>
-    <url>http://cvs.apache.org/viewcvs/maven/src/plugins-build/cactus/</url>
+    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/cactus/</connection>
+    <url>http://cvs.apache.org/viewcvs/maven-plugins/cactus/</url>
   </repository>
   <versions>
     <version>
diff --git a/castor/project.xml b/castor/project.xml
index a26bbc43..847bd7bc 100644
--- a/castor/project.xml
+++ b/castor/project.xml
@@ -11,8 +11,8 @@
   <url>http://maven.apache.org/reference/plugins/castor/</url>
   <siteDirectory>/www/maven.apache.org/reference/plugins/castor/</siteDirectory>
   <repository>
-    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven/src/plugins-build/castor/</connection>
-    <url>http://cvs.apache.org/viewcvs/maven/src/plugins-build/castor/</url>
+    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/castor/</connection>
+    <url>http://cvs.apache.org/viewcvs/maven-plugins/castor/</url>
   </repository>
   <developers>
     <developer>
diff --git a/clover/project.xml b/clover/project.xml
index 102c295e..6e1a8156 100644
--- a/clover/project.xml
+++ b/clover/project.xml
@@ -11,8 +11,8 @@
   <url>http://maven.apache.org/reference/plugins/clover/</url>
   <siteDirectory>/www/maven.apache.org/reference/plugins/clover/</siteDirectory>
   <repository>
-    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven/src/plugins-build/clover/</connection>
-    <url>http://cvs.apache.org/viewcvs/maven/src/plugins-build/clover/</url>
+    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/clover/</connection>
+    <url>http://cvs.apache.org/viewcvs/maven-plugins/clover/</url>
   </repository>
   <versions>
     <version>
diff --git a/codeswitcher/project.xml b/codeswitcher/project.xml
index 039a371b..2244fde2 100644
--- a/codeswitcher/project.xml
+++ b/codeswitcher/project.xml
@@ -14,8 +14,8 @@
   <siteDirectory>/www/maven.apache.org/reference/plugins/codeswitcher/</siteDirectory>
   <distributionDirectory>/www/maven.apache.org/builds/</distributionDirectory>
   <repository>
-    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven/src/plugins-build/codeswitcher/</connection>
-    <url>http://cvs.apache.org/viewcvs/maven/src/plugins-build/codeswitcher/</url>
+    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/codeswitcher/</connection>
+    <url>http://cvs.apache.org/viewcvs/maven-plugins/codeswitcher/</url>
   </repository>
   <developers>
     <developer>
diff --git a/console/project.xml b/console/project.xml
index 33ee40e5..2450854e 100644
--- a/console/project.xml
+++ b/console/project.xml
@@ -13,8 +13,8 @@
   <siteDirectory>/www/maven.apache.org/reference/plugins/console/</siteDirectory>
   <distributionDirectory>/www/maven.apache.org/builds/</distributionDirectory>
   <repository>
-    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven/src/plugins-build/console/</connection>
-    <url>http://cvs.apache.org/viewcvs/maven/src/plugins-build/console/</url>
+    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/console/</connection>
+    <url>http://cvs.apache.org/viewcvs/maven-plugins/console/</url>
   </repository>
   <developers>
     <developer>
diff --git a/cruisecontrol/project.xml b/cruisecontrol/project.xml
index 5fe8ea4b..acd4fc19 100644
--- a/cruisecontrol/project.xml
+++ b/cruisecontrol/project.xml
@@ -10,8 +10,8 @@
   <url>http://maven.apache.org/reference/plugins/cruisecontrol/</url>
   <siteDirectory>/www/maven.apache.org/reference/plugins/cruisecontrol/</siteDirectory>
   <repository>
-    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven/src/plugins-build/cruisecontrol/</connection>
-    <url>http://cvs.apache.org/viewcvs/maven/src/plugins-build/cruisecontrol/</url>
+    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/cruisecontrol/</connection>
+    <url>http://cvs.apache.org/viewcvs/maven-plugins/cruisecontrol/</url>
   </repository>
   <developers>
     <developer>
diff --git a/docbook/project.xml b/docbook/project.xml
index 7eb6098c..6a8056fd 100644
--- a/docbook/project.xml
+++ b/docbook/project.xml
@@ -10,8 +10,8 @@
   <url>http://maven.apache.org/reference/plugins/docbook/</url>
   <siteDirectory>/www/maven.apache.org/reference/plugins/docbook/</siteDirectory>
   <repository>
-    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven/src/plugins-build/docbook/</connection>
-    <url>http://cvs.apache.org/viewcvs/maven/src/plugins-build/docbook/</url>
+    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/docbook/</connection>
+    <url>http://cvs.apache.org/viewcvs/maven-plugins/docbook/</url>
   </repository>
   <developers>
     <developer>
diff --git a/eclipse/project.xml b/eclipse/project.xml
index 768f3864..20c743a8 100644
--- a/eclipse/project.xml
+++ b/eclipse/project.xml
@@ -11,8 +11,8 @@
   <url>http://maven.apache.org/reference/plugins/eclipse/</url>
   <siteDirectory>/www/maven.apache.org/reference/plugins/eclipse/</siteDirectory>
   <repository>
-    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven/src/plugins-build/eclipse/</connection>
-    <url>http://cvs.apache.org/viewcvs/maven/src/plugins-build/eclipse/</url>
+    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/eclipse/</connection>
+    <url>http://cvs.apache.org/viewcvs/maven-plugins/eclipse/</url>
   </repository>
   <developers>
     <developer>
diff --git a/examples/plugin-script/project.xml b/examples/plugin-script/project.xml
index da8b0665..4c4c486e 100644
--- a/examples/plugin-script/project.xml
+++ b/examples/plugin-script/project.xml
@@ -42,8 +42,8 @@
        the connection element has the form:
        scm:<system>:<system specific connection string> -->
   <repository>
-    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven/src/plugins-build/examples/plugin-script</connection>
-    <url>http://cvs.apache.org/viewcvs/maven/src/plugins-build/examples/plugin-script/</url>
+    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/examples/plugin-script</connection>
+    <url>http://cvs.apache.org/viewcvs/maven-plugins/examples/plugin-script/</url>
   </repository>
 
   <!-- any mailing lists for the project -->
diff --git a/examples/project.xml b/examples/project.xml
index 3e73b7c9..e2ab8c8e 100644
--- a/examples/project.xml
+++ b/examples/project.xml
@@ -44,8 +44,8 @@
        scm:<system>:<system specific connection string> -->
 
   <repository>
-    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven/src/plugins-build/examples</connection>
-    <url>http://cvs.apache.org/viewcvs/maven/src/plugins-build/examples/</url>
+    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/examples</connection>
+    <url>http://cvs.apache.org/viewcvs/maven-plugins/examples/</url>
   </repository>
   <!-- any mailing lists for the project -->
 
diff --git a/examples/simple-webapp/project.xml b/examples/simple-webapp/project.xml
index 37ac944a..58dd8fc7 100644
--- a/examples/simple-webapp/project.xml
+++ b/examples/simple-webapp/project.xml
@@ -40,8 +40,8 @@
        the connection element has the form:
        scm:<system>:<system specific connection string> -->
   <repository>
-    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven/src/examples/simple-webapp</connection>
-    <url>http://cvs.apache.org/viewcvs/maven/src/examples/simple-webapp/</url>
+    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/examples/simple-webapp</connection>
+    <url>http://cvs.apache.org/viewcvs/maven-plugins/examples/simple-webapp/</url>
   </repository>
 
   <!-- any mailing lists for the project -->
diff --git a/genapp/project.xml b/genapp/project.xml
index 6e79bfad..08477779 100644
--- a/genapp/project.xml
+++ b/genapp/project.xml
@@ -10,8 +10,8 @@
   <url>http://maven.apache.org/reference/plugins/genapp/</url>
   <siteDirectory>/www/maven.apache.org/reference/plugins/genapp/</siteDirectory>
   <repository>
-    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven/src/plugins-build/genapp/</connection>
-    <url>http://cvs.apache.org/viewcvs/maven/src/plugins-build/genapp/</url>
+    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/genapp/</connection>
+    <url>http://cvs.apache.org/viewcvs/maven-plugins/genapp/</url>
   </repository>
   <developers>
     <developer>
diff --git a/genapp/src/plugin-resources/default/template-resources/project.xml b/genapp/src/plugin-resources/default/template-resources/project.xml
index 70ea9937..7a8e784c 100644
--- a/genapp/src/plugin-resources/default/template-resources/project.xml
+++ b/genapp/src/plugin-resources/default/template-resources/project.xml
@@ -45,8 +45,8 @@
        the connection element has the form:
        scm:<system>:<system specific connection string> -->
   <repository>
-    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven/src/plugins-build/examples</connection>
-    <url>http://cvs.apache.org/viewcvs/maven/src/plugins-build/examples/</url>
+    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/examples</connection>
+    <url>http://cvs.apache.org/viewcvs/maven-plugins/examples/</url>
   </repository>
 
   <!-- any mailing lists for the project -->
diff --git a/gump/project.xml b/gump/project.xml
index 7533b982..b2ba6181 100644
--- a/gump/project.xml
+++ b/gump/project.xml
@@ -11,8 +11,8 @@
   <url>http://maven.apache.org/reference/plugins/gump/</url>
   <siteDirectory>/www/maven.apache.org/reference/plugins/gump/</siteDirectory>
   <repository>
-    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven/src/plugins-build/gump/</connection>
-    <url>http://cvs.apache.org/viewcvs/maven/src/plugins-build/gump/</url>
+    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/gump/</connection>
+    <url>http://cvs.apache.org/viewcvs/maven-plugins/gump/</url>
   </repository>
   <developers>
     <developer>
diff --git a/gump/src/plugin-test/project.xml b/gump/src/plugin-test/project.xml
index fc46398f..6780335e 100644
--- a/gump/src/plugin-test/project.xml
+++ b/gump/src/plugin-test/project.xml
@@ -19,8 +19,8 @@
   <url>http://maven.apache.org/reference/plugins/gump/</url>
   <siteDirectory>/www/maven.apache.org/reference/plugins/gump/</siteDirectory>
   <repository>
-    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven/src/plugins-build/gump/</connection>
-    <url>http://cvs.apache.org/viewcvs/maven/src/plugins-build/gump/</url>
+    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/gump/</connection>
+    <url>http://cvs.apache.org/viewcvs/maven-plugins/gump/</url>
   </repository>
   <developers>
     <developer>
diff --git a/hibernate/project.xml b/hibernate/project.xml
index 93cfdd48..14026b21 100644
--- a/hibernate/project.xml
+++ b/hibernate/project.xml
@@ -11,8 +11,8 @@
   <url>http://maven.apache.org/reference/plugins/hibernate/</url>
   <siteDirectory>/www/maven.apache.org/reference/plugins/hibernate/</siteDirectory>
   <repository>
-    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven/src/plugins-build/hibernate/</connection>
-    <url>http://cvs.apache.org/viewcvs/maven/src/plugins-build/hibernate/</url>
+    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/hibernate/</connection>
+    <url>http://cvs.apache.org/viewcvs/maven-plugins/hibernate/</url>
   </repository>
   <developers>
     <developer>
diff --git a/html2xdoc/project.xml b/html2xdoc/project.xml
index 306cd93f..c526b6dd 100644
--- a/html2xdoc/project.xml
+++ b/html2xdoc/project.xml
@@ -14,8 +14,8 @@
   <url>http://maven.apache.org/reference/plugins/html2xdoc/</url>
   <siteDirectory>/www/maven.apache.org/reference/plugins/html2xdoc/</siteDirectory>
   <repository>
-    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven/src/plugins-build/html2xdoc/</connection>
-    <url>http://cvs.apache.org/viewcvs/maven/src/plugins-build/html2xdoc/</url>
+    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/html2xdoc/</connection>
+    <url>http://cvs.apache.org/viewcvs/maven-plugins/html2xdoc/</url>
   </repository>
   <developers>
     <developer>
diff --git a/html2xdoc/src/plugin-test/project.xml b/html2xdoc/src/plugin-test/project.xml
index e04876f4..0515b7e4 100644
--- a/html2xdoc/src/plugin-test/project.xml
+++ b/html2xdoc/src/plugin-test/project.xml
@@ -19,8 +19,8 @@
   <url>http://maven.apache.org/reference/plugins/java/</url>
   <siteDirectory>/www/maven.apache.org/reference/plugins/java/</siteDirectory>
   <repository>
-    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven/src/plugins-build/java/</connection>
-    <url>http://cvs.apache.org/viewcvs/maven/src/plugins-build/java/</url>
+    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/java/</connection>
+    <url>http://cvs.apache.org/viewcvs/maven-plugins/java/</url>
   </repository>
   <developers>
     <developer>
diff --git a/idea/project.xml b/idea/project.xml
index b98ca27f..cddcccc7 100644
--- a/idea/project.xml
+++ b/idea/project.xml
@@ -10,8 +10,8 @@
   <url>http://maven.apache.org/reference/plugins/idea/</url>
   <siteDirectory>/www/maven.apache.org/reference/plugins/idea/</siteDirectory>
   <repository>
-    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven/src/plugins-build/idea/</connection>
-    <url>http://cvs.apache.org/viewcvs/maven/src/plugins-build/idea/</url>
+    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/idea/</connection>
+    <url>http://cvs.apache.org/viewcvs/maven-plugins/idea/</url>
   </repository>
   <developers>
     <developer>
diff --git a/j2ee/project.xml b/j2ee/project.xml
index 7a8166e7..771d0c5f 100644
--- a/j2ee/project.xml
+++ b/j2ee/project.xml
@@ -11,8 +11,8 @@
   <url>http://maven.apache.org/reference/plugins/j2ee/</url>
   <siteDirectory>/www/maven.apache.org/reference/plugins/j2ee/</siteDirectory>
   <repository>
-    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven/src/plugins-build/j2ee/</connection>
-    <url>http://cvs.apache.org/viewcvs/maven/src/plugins-build/j2ee/</url>
+    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/j2ee/</connection>
+    <url>http://cvs.apache.org/viewcvs/maven-plugins/j2ee/</url>
   </repository>
   <developers>
     <developer>
diff --git a/jalopy/project.xml b/jalopy/project.xml
index 877d7a5c..8b769640 100644
--- a/jalopy/project.xml
+++ b/jalopy/project.xml
@@ -11,8 +11,8 @@
   <url>http://maven.apache.org/reference/plugins/jalopy/</url>
   <siteDirectory>/www/maven.apache.org/reference/plugins/jalopy/</siteDirectory>
   <repository>
-    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven/src/plugins-build/jalopy/</connection>
-    <url>http://cvs.apache.org/viewcvs/maven/src/plugins-build/jalopy/</url>
+    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/jalopy/</connection>
+    <url>http://cvs.apache.org/viewcvs/maven-plugins/jalopy/</url>
   </repository>
   <developers>
     <developer>
diff --git a/jboss/project.xml b/jboss/project.xml
index 51eb3233..54ac09a7 100644
--- a/jboss/project.xml
+++ b/jboss/project.xml
@@ -11,8 +11,8 @@
   <url>http://maven.apache.org/reference/plugins/jboss/</url>
   <siteDirectory>/www/maven.apache.org/reference/plugins/jboss/</siteDirectory>
   <repository>
-    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven/src/plugins-build/jboss/</connection>
-    <url>http://cvs.apache.org/viewcvs/maven/src/plugins-build/jboss/</url>
+    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/jboss/</connection>
+    <url>http://cvs.apache.org/viewcvs/maven-plugins/jboss/</url>
   </repository>
   <versions>
     <version>
diff --git a/jbuilder/project.xml b/jbuilder/project.xml
index b0b3d06f..08aa4f99 100644
--- a/jbuilder/project.xml
+++ b/jbuilder/project.xml
@@ -11,8 +11,8 @@
   <url>http://maven.apache.org/reference/plugins/jbuilder/</url>
   <siteDirectory>/www/maven.apache.org/reference/plugins/jbuilder/</siteDirectory>
   <repository>
-    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven/src/plugins-build/jbuilder/</connection>
-    <url>http://cvs.apache.org/viewcvs/maven/src/plugins-build/jbuilder/</url>
+    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/jbuilder/</connection>
+    <url>http://cvs.apache.org/viewcvs/maven-plugins/jbuilder/</url>
   </repository>
   <developers>
     <developer>
diff --git a/jcoverage/project.xml b/jcoverage/project.xml
index 3796e11f..843f084a 100644
--- a/jcoverage/project.xml
+++ b/jcoverage/project.xml
@@ -12,8 +12,8 @@
   <url>http://maven.apache.org/reference/plugins/jcoverage/</url>
   <siteDirectory>/www/maven.apache.org/reference/plugins/jcoverage/</siteDirectory>
   <repository>
-    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven/src/plugins-build/jcoverage/</connection>
-    <url>http://cvs.apache.org/viewcvs/maven/src/plugins-build/jcoverage/</url>
+    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/jcoverage/</connection>
+    <url>http://cvs.apache.org/viewcvs/maven-plugins/jcoverage/</url>
   </repository>
   <developers>
     <developer>
diff --git a/jdee/project.xml b/jdee/project.xml
index dd51495f..221cf82f 100644
--- a/jdee/project.xml
+++ b/jdee/project.xml
@@ -15,8 +15,8 @@
   <url>http://maven.apache.org/reference/plugins/jdee/</url>
   <siteDirectory>/www/maven.apache.org/reference/plugins/jdee/</siteDirectory>
   <repository>
-    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven/src/plugins-build/jdee/</connection>
-    <url>http://cvs.apache.org/viewcvs/maven/src/plugins-build/jdee/</url>
+    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/jdee/</connection>
+    <url>http://cvs.apache.org/viewcvs/maven-plugins/jdee/</url>
   </repository>
   <developers>
     <developer>
diff --git a/jdeveloper/project.xml b/jdeveloper/project.xml
index e3811988..be233a65 100644
--- a/jdeveloper/project.xml
+++ b/jdeveloper/project.xml
@@ -12,8 +12,8 @@
   <url>http://maven.apache.org/reference/plugins/jdeveloper/</url>
   <siteDirectory>/www/maven.apache.org/reference/plugins/jdeveloper/</siteDirectory>
   <repository>
-    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven/src/plugins-build/jdeveloper</connection>
-    <url>http://cvs.apache.org/viewcvs/maven/src/plugins-build/jdeveloper/</url>
+    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/jdeveloper</connection>
+    <url>http://cvs.apache.org/viewcvs/maven-plugins/jdeveloper/</url>
   </repository>
   <developers>
     <developer>
diff --git a/jdiff/project.xml b/jdiff/project.xml
index 64e4d44a..7c229023 100644
--- a/jdiff/project.xml
+++ b/jdiff/project.xml
@@ -11,8 +11,8 @@
   <url>http://maven.apache.org/reference/plugins/jdiff/</url>
   <siteDirectory>/www/maven.apache.org/reference/plugins/jdiff/</siteDirectory>
   <repository>
-    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven/src/plugins-build/jdiff/</connection>
-    <url>http://cvs.apache.org/viewcvs/maven/src/plugins-build/jdiff/</url>
+    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/jdiff/</connection>
+    <url>http://cvs.apache.org/viewcvs/maven-plugins/jdiff/</url>
   </repository>
   <developers>
     <developer>
diff --git a/jnlp/project.xml b/jnlp/project.xml
index bcbf9ef3..bc3c69e6 100644
--- a/jnlp/project.xml
+++ b/jnlp/project.xml
@@ -10,8 +10,8 @@
   <url>http://maven.apache.org/reference/plugins/jnlp/</url>
   <siteDirectory>/www/maven.apache.org/reference/plugins/jnlp/</siteDirectory>
   <repository>
-    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven/src/plugins-build/jnlp/</connection>
-    <url>http://cvs.apache.org/viewcvs/maven/src/plugins-build/jnlp/</url>
+    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/jnlp/</connection>
+    <url>http://cvs.apache.org/viewcvs/maven-plugins/jnlp/</url>
   </repository>
   <developers>
     <developer>
diff --git a/junitdoclet/project.xml b/junitdoclet/project.xml
index f78cd981..c1415f4b 100644
--- a/junitdoclet/project.xml
+++ b/junitdoclet/project.xml
@@ -11,8 +11,8 @@
   <url>http://maven.apache.org/reference/plugins/junitdoclet/</url>
   <siteDirectory>/www/maven.apache.org/reference/plugins/junitdoclet/</siteDirectory>
   <repository>
-    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven/src/plugins-build/junitdoclet/</connection>
-    <url>http://cvs.apache.org/viewcvs/maven/src/plugins-build/junitdoclet/</url>
+    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/junitdoclet/</connection>
+    <url>http://cvs.apache.org/viewcvs/maven-plugins/junitdoclet/</url>
   </repository>
   <developers>
     <developer>
diff --git a/latex/project.xml b/latex/project.xml
index 41e95bb6..b49e65ce 100644
--- a/latex/project.xml
+++ b/latex/project.xml
@@ -11,8 +11,8 @@
   <url>http://maven.apache.org/reference/plugins/latex/</url>
   <siteDirectory>/www/maven.apache.org/reference/plugins/latex/</siteDirectory>
   <repository>
-    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven/src/plugins-build/latex/</connection>
-    <url>http://cvs.apache.org/viewcvs/maven/src/plugins-build/latex/</url>
+    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/latex/</connection>
+    <url>http://cvs.apache.org/viewcvs/maven-plugins/latex/</url>
   </repository>
   <developers>
     <developer>
diff --git a/latka/project.xml b/latka/project.xml
index 12783cb7..f38b7ac1 100644
--- a/latka/project.xml
+++ b/latka/project.xml
@@ -11,8 +11,8 @@
   <url>http://maven.apache.org/reference/plugins/latka/</url>
   <siteDirectory>/www/maven.apache.org/reference/plugins/latka/</siteDirectory>
   <repository>
-    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven/src/plugins-build/latka/</connection>
-    <url>http://cvs.apache.org/viewcvs/maven/src/plugins-build/latka/</url>
+    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/latka/</connection>
+    <url>http://cvs.apache.org/viewcvs/maven-plugins/latka/</url>
   </repository>
   <developers>
     <developer>
diff --git a/native/project.xml b/native/project.xml
index f9d44459..27a2038d 100644
--- a/native/project.xml
+++ b/native/project.xml
@@ -11,8 +11,8 @@
   <url>http://maven.apache.org/reference/plugins/native/</url>
   <siteDirectory>/www/maven.apache.org/reference/plugins/native/</siteDirectory>
   <repository>
-    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven/src/plugins-build/native/</connection>
-    <url>http://cvs.apache.org/viewcvs/maven/src/plugins-build/native/</url>
+    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/native/</connection>
+    <url>http://cvs.apache.org/viewcvs/maven-plugins/native/</url>
   </repository>
   <developers>
     <developer>
diff --git a/pdf/project.xml b/pdf/project.xml
index b9f95c98..4de1fdf3 100644
--- a/pdf/project.xml
+++ b/pdf/project.xml
@@ -11,8 +11,8 @@
   <url>http://maven.apache.org/reference/plugins/pdf/</url>
   <siteDirectory>/www/maven.apache.org/reference/plugins/pdf/</siteDirectory>
   <repository>
-    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven/src/plugins-build/pdf/</connection>
-    <url>http://cvs.apache.org/viewcvs/maven/src/plugins-build/pdf/</url>
+    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/pdf/</connection>
+    <url>http://cvs.apache.org/viewcvs/maven-plugins/pdf/</url>
   </repository>
   <developers>
     <developer>
diff --git a/perforce/project.xml b/perforce/project.xml
index 0f4b723e..df6f27bb 100644
--- a/perforce/project.xml
+++ b/perforce/project.xml
@@ -13,8 +13,8 @@
   <url>http://maven.apache.org/reference/plugins/perforce/</url>
   <siteDirectory>/www/maven.apache.org/reference/plugins/perforce/</siteDirectory>
   <repository>
-    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven/src/plugins-build/perforce/</connection>
-    <url>http://cvs.apache.org/viewcvs/maven/src/plugins-build/perforce/</url>
+    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/perforce/</connection>
+    <url>http://cvs.apache.org/viewcvs/maven-plugins/perforce/</url>
   </repository>
   <!-- THIS IS INCOMPLETE -->
 
diff --git a/pmd/project.xml b/pmd/project.xml
index 73bdcc4e..8666dc50 100644
--- a/pmd/project.xml
+++ b/pmd/project.xml
@@ -11,8 +11,8 @@
   <url>http://maven.apache.org/reference/plugins/pmd/</url>
   <siteDirectory>/www/maven.apache.org/reference/plugins/pmd/</siteDirectory>
   <repository>
-    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven/src/plugins-build/pmd/</connection>
-    <url>http://cvs.apache.org/viewcvs/maven/src/plugins-build/pmd/</url>
+    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/pmd/</connection>
+    <url>http://cvs.apache.org/viewcvs/maven-plugins/pmd/</url>
   </repository>
   <versions>
     <version>
diff --git a/pom/project.xml b/pom/project.xml
index 75e6dec6..5dec38f9 100644
--- a/pom/project.xml
+++ b/pom/project.xml
@@ -11,8 +11,8 @@
   <url>http://maven.apache.org/reference/plugins/pom/</url>
   <siteDirectory>/www/maven.apache.org/reference/plugins/pom/</siteDirectory>
   <repository>
-    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven/src/plugins-build/pom/</connection>
-    <url>http://cvs.apache.org/viewcvs/maven/src/plugins-build/pom/</url>
+    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/pom/</connection>
+    <url>http://cvs.apache.org/viewcvs/maven-plugins/pom/</url>
   </repository>
   <developers>
     <developer>
diff --git a/release/project.xml b/release/project.xml
index 8c82f838..b74fa8b2 100644
--- a/release/project.xml
+++ b/release/project.xml
@@ -11,8 +11,8 @@
   <url>http://maven.apache.org/reference/plugins/release/</url>
   <siteDirectory>/www/maven.apache.org/reference/plugins/release/</siteDirectory>
   <repository>
-    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven/src/plugins-build/release/</connection>
-    <url>http://cvs.apache.org/viewcvs/maven/src/plugins-build/release/</url>
+    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/release/</connection>
+    <url>http://cvs.apache.org/viewcvs/maven-plugins/release/</url>
   </repository>
   <developers>
     <developer>
diff --git a/repository/project.xml b/repository/project.xml
index 67ed8cb1..093b9972 100644
--- a/repository/project.xml
+++ b/repository/project.xml
@@ -11,8 +11,8 @@
   <siteDirectory>/www/maven.apache.org/reference/plugins/repository/</siteDirectory>
   <distributionDirectory>/www/maven.apache.org/builds/</distributionDirectory>
   <repository>
-    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven/src/plugins-build/repository/</connection>
-    <url>http://cvs.apache.org/viewcvs/maven/src/plugins-build/repository/</url>
+    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/repository/</connection>
+    <url>http://cvs.apache.org/viewcvs/maven-plugins/repository/</url>
   </repository>
   <developers>
     <developer>
diff --git a/runner/project.xml b/runner/project.xml
index 273f7db6..a9973b50 100644
--- a/runner/project.xml
+++ b/runner/project.xml
@@ -11,8 +11,8 @@
   <url>http://maven.apache.org/reference/plugins/plexus/</url>
   <siteDirectory>/www/maven.apache.org/reference/plugins/plexus/</siteDirectory>
   <repository>
-    <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>
+    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/plexus/</connection>
+    <url>http://cvs.apache.org/viewcvs/maven-plugins/plexus/</url>
   </repository>
   <developers/>
   <dependencies>
diff --git a/sea/project.xml b/sea/project.xml
index 41476e98..de8a1a0c 100644
--- a/sea/project.xml
+++ b/sea/project.xml
@@ -11,8 +11,8 @@
   <url>http://maven.apache.org/reference/plugins/deploy/</url>
   <siteDirectory>/www/maven.apache.org/reference/plugins/sea/</siteDirectory>
   <repository>
-    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven/src/plugins-build/sea/</connection>
-    <url>http://cvs.apache.org/viewcvs/maven/src/plugins-build/sea/</url>
+    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/sea/</connection>
+    <url>http://cvs.apache.org/viewcvs/maven-plugins/sea/</url>
   </repository>
   <developers>
     <developer>
diff --git a/shell/project.xml b/shell/project.xml
index 6aaf5b11..94859e36 100644
--- a/shell/project.xml
+++ b/shell/project.xml
@@ -11,8 +11,8 @@
   <url>http://maven.apache.org/reference/plugins/shell/</url>
   <siteDirectory>/www/maven.apache.org/reference/plugins/shell/</siteDirectory>
   <repository>
-    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven/src/plugins-build/shell/</connection>
-    <url>http://cvs.apache.org/viewcvs/maven/src/plugins-build/shell/</url>
+    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/shell/</connection>
+    <url>http://cvs.apache.org/viewcvs/maven-plugins/shell/</url>
   </repository>
   <developers>
     <developer>
diff --git a/simian/project.xml b/simian/project.xml
index 68836bfa..63577d5b 100644
--- a/simian/project.xml
+++ b/simian/project.xml
@@ -11,8 +11,8 @@
   <siteDirectory>/www/maven.apache.org/reference/plugins/simian/</siteDirectory>
   <package>org.apache.maven.simian</package>
   <repository>
-    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven/src/plugins-build/simian/</connection>
-    <url>http://cvs.apache.org/viewcvs/maven/src/plugins-build/simian/</url>
+    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/simian/</connection>
+    <url>http://cvs.apache.org/viewcvs/maven-plugins/simian/</url>
   </repository>
   <dependencies>
     <dependency>
diff --git a/statcvs/project.xml b/statcvs/project.xml
index 9ecae3d4..b320e3bf 100644
--- a/statcvs/project.xml
+++ b/statcvs/project.xml
@@ -12,8 +12,8 @@
   <url>http://maven.apache.org/reference/plugins/statcvs/</url>
   <siteDirectory>/www/maven.apache.org/reference/plugins/statcvs/</siteDirectory>
   <repository>
-    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven/src/plugins-build/statcvs/</connection>
-    <url>http://cvs.apache.org/viewcvs/maven/src/plugins-build/statcvs/</url>
+    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/statcvs/</connection>
+    <url>http://cvs.apache.org/viewcvs/maven-plugins/statcvs/</url>
   </repository>
   <versions>
     <version>
diff --git a/struts/project.xml b/struts/project.xml
index bd958e85..fc1df034 100644
--- a/struts/project.xml
+++ b/struts/project.xml
@@ -11,8 +11,8 @@
   <url>http://maven.apache.org/reference/plugins/struts/</url>
   <siteDirectory>/www/maven.apache.org/reference/plugins/struts/</siteDirectory>
   <repository>
-    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven/src/plugins-build/struts/</connection>
-    <url>http://cvs.apache.org/viewcvs/maven/src/plugins-build/struts/</url>
+    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/struts/</connection>
+    <url>http://cvs.apache.org/viewcvs/maven-plugins/struts/</url>
   </repository>
   <developers>
     <developer>
diff --git a/summit/project.xml b/summit/project.xml
index 1a89398f..76ecc4cd 100644
--- a/summit/project.xml
+++ b/summit/project.xml
@@ -11,8 +11,8 @@
   <url>http://maven.apache.org/reference/plugins/summit/</url>
   <siteDirectory>/www/maven.apache.org/reference/plugins/summit/</siteDirectory>
   <repository>
-    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven/src/plugins-build/summit/</connection>
-    <url>http://cvs.apache.org/viewcvs/maven/src/plugins-build/summit/</url>
+    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/summit/</connection>
+    <url>http://cvs.apache.org/viewcvs/maven-plugins/summit/</url>
   </repository>
   <developers/>
   <dependencies>
diff --git a/tjdo/project.xml b/tjdo/project.xml
index 467d7db0..2ab97736 100644
--- a/tjdo/project.xml
+++ b/tjdo/project.xml
@@ -11,8 +11,8 @@
   <url>http://maven.apache.org/reference/plugins/tjdo/</url>
   <siteDirectory>/www/maven.apache.org/reference/plugins/tjdo/</siteDirectory>
   <repository>
-    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven/src/plugins-build/tjdo/</connection>
-    <url>http://cvs.apache.org/viewcvs/maven/src/plugins-build/tjdo/</url>
+    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/tjdo/</connection>
+    <url>http://cvs.apache.org/viewcvs/maven-plugins/tjdo/</url>
   </repository>
   <developers/>
   <dependencies>
diff --git a/torque/project.xml b/torque/project.xml
index 38b92db3..5ef647fa 100644
--- a/torque/project.xml
+++ b/torque/project.xml
@@ -11,8 +11,8 @@
   <url>http://maven.apache.org/reference/plugins/torque/</url>
   <siteDirectory>/www/maven.apache.org/reference/plugins/torque/</siteDirectory>
   <repository>
-    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven/src/plugins-build/torque/</connection>
-    <url>http://cvs.apache.org/viewcvs/maven/src/plugins-build/torque/</url>
+    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/torque/</connection>
+    <url>http://cvs.apache.org/viewcvs/maven-plugins/torque/</url>
   </repository>
   <mailingLists>
     <mailingList>
diff --git a/uberjar/project.xml b/uberjar/project.xml
index ab443da7..a4ef0ea6 100644
--- a/uberjar/project.xml
+++ b/uberjar/project.xml
@@ -23,8 +23,8 @@
   <url>http://maven.apache.org/reference/plugins/uberjar/</url>
   <siteDirectory>/www/maven.apache.org/reference/plugins/uberjar/</siteDirectory>
   <repository>
-    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven/src/plugins-build/uberjar/</connection>
-    <url>http://cvs.apache.org/viewcvs/maven/src/plugins-build/uberjar/</url>
+    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/uberjar/</connection>
+    <url>http://cvs.apache.org/viewcvs/maven-plugins/uberjar/</url>
   </repository>
   <!-- any mailing lists for the project -->
 
diff --git a/was40/project.xml b/was40/project.xml
index 5edc2353..9ca0c3b1 100644
--- a/was40/project.xml
+++ b/was40/project.xml
@@ -11,8 +11,8 @@
   <url>http://maven.apache.org/reference/plugins/was40/</url>
   <siteDirectory>/www/maven.apache.org/reference/plugins/was40/</siteDirectory>
   <repository>
-    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven/src/plugins-build/was40/</connection>
-    <url>http://cvs.apache.org/viewcvs/maven/src/plugins-build/was40/</url>
+    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/was40/</connection>
+    <url>http://cvs.apache.org/viewcvs/maven-plugins/was40/</url>
   </repository>
   <developers>
     <developer>
diff --git a/webserver/project.xml b/webserver/project.xml
index 0723e8ec..3cbbb8e4 100644
--- a/webserver/project.xml
+++ b/webserver/project.xml
@@ -11,8 +11,8 @@
   <url>http://maven.apache.org/reference/plugins/webserver/</url>
   <siteDirectory>/www/maven.apache.org/reference/plugins/webserver/</siteDirectory>
   <repository>
-    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven/src/plugins-build/webserver/</connection>
-    <url>http://cvs.apache.org/viewcvs/maven/src/plugins-build/webserver/</url>
+    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/webserver/</connection>
+    <url>http://cvs.apache.org/viewcvs/maven-plugins/webserver/</url>
   </repository>
   <developers>
     <developer>
diff --git a/wizard/project.xml b/wizard/project.xml
index 848340ed..3d5975d1 100644
--- a/wizard/project.xml
+++ b/wizard/project.xml
@@ -10,8 +10,8 @@
   <url>http://maven.apache.org/reference/plugins/wizard/</url>
   <siteDirectory>/www/maven.apache.org/reference/plugins/wizard/</siteDirectory>
   <repository>
-    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven/src/plugins-build/wizard/</connection>
-    <url>http://cvs.apache.org/viewcvs/maven/src/plugins-build/wizard/</url>
+    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/wizard/</connection>
+    <url>http://cvs.apache.org/viewcvs/maven-plugins/wizard/</url>
   </repository>
   <developers>
     <developer>
diff --git a/word2html/project.xml b/word2html/project.xml
index 09a4ca25..3ea1ecba 100644
--- a/word2html/project.xml
+++ b/word2html/project.xml
@@ -11,8 +11,8 @@
   <url>http://maven.apache.org/reference/plugins/word2html/</url>
   <siteDirectory>/www/maven.apache.org/reference/plugins/word2html/</siteDirectory>
   <repository>
-    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven/src/plugins-build/word2html/</connection>
-    <url>http://cvs.apache.org/viewcvs/maven/src/plugins-build/word2html/</url>
+    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/word2html/</connection>
+    <url>http://cvs.apache.org/viewcvs/maven-plugins/word2html/</url>
   </repository>
   <developers>
     <developer>