diff --git a/plugin/project.xml b/plugin/project.xml
index d66823a4..f36522f1 100644
--- a/plugin/project.xml
+++ b/plugin/project.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+
 <!-- 
 /*
  * Copyright 2001-2004 The Apache Software Foundation.
@@ -17,20 +18,20 @@
  */
  -->
 
-
 <project>
   <extend>../project.xml</extend>
   <pomVersion>3</pomVersion>
   <id>maven-plugin-plugin</id>
   <name>Maven Plugin Plugin</name>
-  <currentVersion>1.2-SNAPSHOT</currentVersion>
+  <currentVersion>1.2</currentVersion>
   <description/>
   <shortDescription>Maven Plugin plugin</shortDescription>
   <url>http://maven.apache.org/reference/plugins/plugin/</url>
   <siteDirectory>/www/maven.apache.org/reference/plugins/plugin/</siteDirectory>
   <repository>
-    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven/src/plugins-build/plugin/</connection>
-    <url>http://cvs.apache.org/viewcvs/maven/src/plugins-build/plugin/</url>
+    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/plugin/</connection>
+    <developerConnection>scm:cvs:ext:${maven.username}@cvs.apache.org:/home/cvs:maven-plugins/plugin/</developerConnection>
+    <url>http://cvs.apache.org/viewcvs/maven-plugins/plugin/</url>
   </repository>
   <developers>
     <developer>
@@ -63,4 +64,11 @@
       </properties>
     </dependency>
   </dependencies>
+  <versions>
+    <version>
+      <id>1.2</id>
+      <name>1.2</name>
+      <tag>MAVEN_PLUGIN_1_2</tag>
+    </version>
+  </versions>
 </project>
diff --git a/plugin/xdocs/changes.xml b/plugin/xdocs/changes.xml
index 7c47ea78..c94551f7 100644
--- a/plugin/xdocs/changes.xml
+++ b/plugin/xdocs/changes.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
+
 <!-- 
 /*
  * Copyright 2001-2004 The Apache Software Foundation.
@@ -22,41 +23,18 @@
     <title>Changes</title>
     <author email="evenisse@ifrance.com">Emmanuel Venisse</author>
   </properties>
-
   <body>
-    <release version="1.2" date="in CVS">
-      <action dev="epugh" type="update">
-        Fixed the plugin:download goal to work.  Previously it would delete
-        the plugin you just downloaded.  Also now leverages the plugin:uninstall
-        goal.
-      </action>    	
-      <action dev="vmassol" type="add">
-        Added assert:assertEquals tag to verify if two values are equal
-        while testing a plugin.
-      </action>
-      <action dev="vmassol" type="add">
-        Added assert:assertFileExists tag to verify if a file exists while
-        testing a plugin.
-      </action>
-      <action dev="dion" type="add">
-        Add plugin:test goal
-      </action>
-      <action dev="brett" type="add">
-        Add plugin:repository-deploy goal
-      </action>
-      <action dev="brett" type="update">
-        Split plugin:download goal into plugin:download-artifact goal and the original goal that downloads
-        and installs the plugin. Download to local repository as well.
-      </action>
+    <release version="1.2" date="2004-03-07">
+      <action dev="epugh" type="update">Fixed the plugin:download goal to work. Previously it would delete the plugin you just downloaded. Also now leverages the plugin:uninstall goal.</action>
+      <action dev="vmassol" type="add">Added assert:assertEquals tag to verify if two values are equal while testing a plugin.</action>
+      <action dev="vmassol" type="add">Added assert:assertFileExists tag to verify if a file exists while testing a plugin.</action>
+      <action dev="dion" type="add">Add plugin:test goal</action>
+      <action dev="brett" type="add">Add plugin:repository-deploy goal</action>
+      <action dev="brett" type="update">Split plugin:download goal into plugin:download-artifact goal and the original goal that downloads and installs the plugin. Download to local repository as well.</action>
     </release>
-    
-	<release version="1.1" date="2003-09-29">
-	  <action dev="dion" type="add">
-	    Added plugin:download goal
-	  </action>
-      <action dev="evenisse" type="fix">
-        Fixed MAVEN-708. Fix the goals description generation if there is no plugin.jelly file.
-      </action>
+    <release version="1.1" date="2003-09-29">
+      <action dev="dion" type="add">Added plugin:download goal</action>
+      <action dev="evenisse" type="fix">Fixed MAVEN-708. Fix the goals description generation if there is no plugin.jelly file.</action>
     </release>
   </body>
 </document>
diff --git a/scm/project.xml b/scm/project.xml
index 8dcbd1d8..8f97143e 100644
--- a/scm/project.xml
+++ b/scm/project.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+
 <!-- 
 /*
  * Copyright 2001-2004 The Apache Software Foundation.
@@ -17,19 +18,19 @@
  */
  -->
 
-
 <project>
   <extend>../project.xml</extend>
   <id>maven-scm-plugin</id>
   <name>Maven Source Control Management Plug-in</name>
-  <currentVersion>1.2-SNAPSHOT</currentVersion>
+  <currentVersion>1.2</currentVersion>
   <description>A plugin for SCM tasks, currently CVS.</description>
   <shortDescription>SCM Plugin for Maven. Requires Maven 1.0 RC2.</shortDescription>
   <url>http://maven.apache.org/reference/plugins/scm/</url>
   <siteDirectory>/www/maven.apache.org/reference/plugins/scm/</siteDirectory>
   <repository>
-    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven/src/plugins-build/scm/</connection>
-    <url>http://cvs.apache.org/viewcvs/maven/src/plugins-build/scm/</url>
+    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/scm/</connection>
+    <developerConnection>scm:cvs:ext:${maven.username}@cvs.apache.org:/home/cvs:maven-plugins/scm/</developerConnection>
+    <url>http://cvs.apache.org/viewcvs/maven-plugins/scm/</url>
   </repository>
   <versions>
     <version>
@@ -47,6 +48,11 @@
       <name>SNAPSHOT</name>
       <tag>HEAD</tag>
     </version>
+    <version>
+      <id>1.2</id>
+      <name>1.2</name>
+      <tag>MAVEN_SCM_1_2</tag>
+    </version>
   </versions>
   <developers>
     <developer>
@@ -68,4 +74,3 @@
     </dependency>
   </dependencies>
 </project>
-
diff --git a/scm/xdocs/changes.xml b/scm/xdocs/changes.xml
index 6911bcc8..95f54b44 100644
--- a/scm/xdocs/changes.xml
+++ b/scm/xdocs/changes.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
+
 <!-- 
 /*
  * Copyright 2001-2004 The Apache Software Foundation.
@@ -22,45 +23,22 @@
     <title>Changes</title>
     <author email="brett@apache.org">Brett Porter</author>
   </properties>
-
   <body>
-    <release version="1.2-SNAPSHOT" date="in CVS">
-      <action dev="brett" type="fix">
-        Don't use -C - Mac OS X doesn't recognise it
-      </action>
-      <action dev="brett" type="fix" issue="MPSCM-3">
-        Catch exceptions to make sure files don't get moved permanently.
-      </action>
-      <action dev="brett" type="fix" issue="MPSCM-4">
-        Update POM using dom4j instead of JSL - no more formatting issues.
-      </action>
-      <action dev="brett" type="fix">
-        Support :local: CVS paths
-      </action>
-      <action dev="brett" type="add">
-        Update changes.xml version and release date on prepare.
-      </action>
-      <action dev="brett" type="add">
-        Use developerConnection first, then standard connection when parsing connection from POM.
-      </action>
+    <release version="1.2" date="2004-03-07">
+      <action dev="brett" type="fix">Don't use -C - Mac OS X doesn't recognise it</action>
+      <action dev="brett" type="fix" issue="MPSCM-3">Catch exceptions to make sure files don't get moved permanently.</action>
+      <action dev="brett" type="fix" issue="MPSCM-4">Update POM using dom4j instead of JSL - no more formatting issues.</action>
+      <action dev="brett" type="fix">Support :local: CVS paths</action>
+      <action dev="brett" type="add">Update changes.xml version and release date on prepare.</action>
+      <action dev="brett" type="add">Use developerConnection first, then standard connection when parsing connection from POM.</action>
     </release>
-
     <release version="1.1" date="2003-09-29">
-      <action dev="dion" type="update">
-        Apply MAVEN-834. Support for scm delimiters other than ':'
-      </action>
-      <action dev="brett" type="fix">
-        Turn off pretty printing to fix MAVEN-769 - random spaces added
-        to project.xml.
-      </action>
-      <action dev="brett" type="update">
-        Add new versions to bottom of list instead of top to follow convention.
-      </action>
+      <action dev="dion" type="update">Apply MAVEN-834. Support for scm delimiters other than ':'</action>
+      <action dev="brett" type="fix">Turn off pretty printing to fix MAVEN-769 - random spaces added to project.xml.</action>
+      <action dev="brett" type="update">Add new versions to bottom of list instead of top to follow convention.</action>
     </release>
     <release version="1.0" date="2003-08-31">
-      <action dev="brett" type="add">
-        Initial creation - support for CVS.
-      </action>
+      <action dev="brett" type="add">Initial creation - support for CVS.</action>
     </release>
   </body>
 </document>
