diff --git a/maven-archetype/maven-archetypes/pom.xml b/maven-archetype/maven-archetypes/pom.xml
index dd9195e081..6452d8a0c5 100644
--- a/maven-archetype/maven-archetypes/pom.xml
+++ b/maven-archetype/maven-archetypes/pom.xml
@@ -10,6 +10,7 @@
   <packaging>pom</packaging>
   <version>1.0-alpha-1-SNAPSHOT</version>
   <modules>
+    <module>maven-archetype-marmalade-mojo</module>
     <module>maven-archetype-mojo</module>
     <module>maven-archetype-quickstart</module>
     <module>maven-archetype-webapp</module>
diff --git a/maven-archiver/pom.xml b/maven-archiver/pom.xml
index 71b4386109..48cca721dc 100644
--- a/maven-archiver/pom.xml
+++ b/maven-archiver/pom.xml
@@ -6,7 +6,6 @@
     <version>2.0-SNAPSHOT</version>
   </parent>
   <artifactId>maven-archiver</artifactId>
-  <version>1.0-SNAPSHOT</version>
   <name>Maven Archiver</name>
   <dependencies>
     <dependency>
diff --git a/maven-artifact/pom.xml b/maven-artifact/pom.xml
index 11877a679d..4294c3ca04 100644
--- a/maven-artifact/pom.xml
+++ b/maven-artifact/pom.xml
@@ -6,9 +6,7 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>maven-artifact</artifactId>
-  <name>Maven</name>
-  <version>2.0-SNAPSHOT</version>
-  <inceptionYear>2001</inceptionYear>
+  <name>Maven Artifact</name>
   <dependencies>
     <dependency>
       <groupId>plexus</groupId>
diff --git a/maven-core/pom.xml b/maven-core/pom.xml
index 7b1cc3145d..a950621378 100644
--- a/maven-core/pom.xml
+++ b/maven-core/pom.xml
@@ -7,8 +7,6 @@
   <modelVersion>4.0.0</modelVersion>
   <artifactId>maven-core</artifactId>
   <name>Maven</name>
-  <version>2.0-SNAPSHOT</version>
-  <inceptionYear>2001</inceptionYear>
   <dependencies>
     <dependency>
       <groupId>plexus</groupId>
diff --git a/maven-mboot2/pom.xml b/maven-mboot2/pom.xml
index 5859ccc668..ccde5d8745 100644
--- a/maven-mboot2/pom.xml
+++ b/maven-mboot2/pom.xml
@@ -6,9 +6,7 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>maven-mboot</artifactId>
-  <packaging>jar</packaging>
   <name>Maven MBoot</name>
-  <version>2.0-SNAPSHOT</version>
   <description>Tool used to bootstrap m2.</description>
   <dependencies>
     <dependency>
diff --git a/maven-model/pom.xml b/maven-model/pom.xml
index 2106e094a9..75a884a26e 100644
--- a/maven-model/pom.xml
+++ b/maven-model/pom.xml
@@ -5,10 +5,8 @@
     <version>2.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.maven</groupId>
   <artifactId>maven-model</artifactId>
   <name>Maven Model</name>
-  <version>2.0-SNAPSHOT</version>
   <description>Maven Model</description>
   <dependencies>
     <dependency>
diff --git a/maven-monitor/pom.xml b/maven-monitor/pom.xml
index 2234593696..4a9341f231 100644
--- a/maven-monitor/pom.xml
+++ b/maven-monitor/pom.xml
@@ -6,6 +6,5 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>maven-monitor</artifactId>
-  <version>2.0-SNAPSHOT</version>
   <name>Maven Monitor</name>
 </project>
diff --git a/maven-plugin-tools/maven-plugin-tools-api/pom.xml b/maven-plugin-tools/maven-plugin-tools-api/pom.xml
index 821bb166d0..7e76622641 100644
--- a/maven-plugin-tools/maven-plugin-tools-api/pom.xml
+++ b/maven-plugin-tools/maven-plugin-tools-api/pom.xml
@@ -6,9 +6,7 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>maven-plugin-tools-api</artifactId>
-  <packaging>jar</packaging>
   <name>Maven Plugin Tools APIs</name>
-  <version>2.0-SNAPSHOT</version>
   <dependencies>
     <dependency>
       <groupId>org.codehaus.modello</groupId>
diff --git a/maven-plugin-tools/maven-plugin-tools-java/pom.xml b/maven-plugin-tools/maven-plugin-tools-java/pom.xml
index cc9f144740..f7a05af61a 100644
--- a/maven-plugin-tools/maven-plugin-tools-java/pom.xml
+++ b/maven-plugin-tools/maven-plugin-tools-java/pom.xml
@@ -6,9 +6,7 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>maven-plugin-tools-java</artifactId>
-  <packaging>jar</packaging>
   <name>Maven Plugin Tools for Java</name>
-  <version>2.0-SNAPSHOT</version>
   <dependencies>
     <dependency>
       <groupId>qdox</groupId>
diff --git a/maven-plugin-tools/maven-plugin-tools-marmalade/pom.xml b/maven-plugin-tools/maven-plugin-tools-marmalade/pom.xml
index 1c86748708..3343eddfd1 100644
--- a/maven-plugin-tools/maven-plugin-tools-marmalade/pom.xml
+++ b/maven-plugin-tools/maven-plugin-tools-marmalade/pom.xml
@@ -6,9 +6,7 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>maven-plugin-tools-marmalade</artifactId>
-  <packaging>jar</packaging>
   <name>Maven Plugin Tools for Marmalade</name>
-  <version>2.0-SNAPSHOT</version>
   <dependencies>
     <dependency>
       <groupId>marmalade</groupId>
diff --git a/maven-plugin-tools/maven-plugin-tools-pluggy/pom.xml b/maven-plugin-tools/maven-plugin-tools-pluggy/pom.xml
index 243cd641b9..e002d4b804 100644
--- a/maven-plugin-tools/maven-plugin-tools-pluggy/pom.xml
+++ b/maven-plugin-tools/maven-plugin-tools-pluggy/pom.xml
@@ -6,9 +6,7 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>maven-plugin-tools-pluggy</artifactId>
-  <packaging>jar</packaging>
   <name>Maven Pluggy Simplistic Plugin Generator</name>
-  <version>2.0-SNAPSHOT</version>
   <dependencies>
     <dependency>
       <groupId>org.apache.maven</groupId>
diff --git a/maven-plugin-tools/pom.xml b/maven-plugin-tools/pom.xml
index 2c507353f9..0a2239b221 100644
--- a/maven-plugin-tools/pom.xml
+++ b/maven-plugin-tools/pom.xml
@@ -6,7 +6,6 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>maven-plugin-tools</artifactId>
-  <version>2.0-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>Maven Plugin Tools Base POM</name>
   <modules>
diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml
index 4e00f0f697..e60b8364f0 100644
--- a/maven-plugin/pom.xml
+++ b/maven-plugin/pom.xml
@@ -7,7 +7,6 @@
   <modelVersion>4.0.0</modelVersion>
   <artifactId>maven-plugin</artifactId>
   <name>Maven Plugin</name>
-  <version>2.0-SNAPSHOT</version>
   <dependencies>
     <!-- TODO: can we avoid this dependency so that it is not propogated to Mojo implementors?
          Maybe split plugin-api from the descriptor builder? -->
diff --git a/maven-script/maven-script-marmalade/pom.xml b/maven-script/maven-script-marmalade/pom.xml
index 1f503cf83d..84152b7fea 100644
--- a/maven-script/maven-script-marmalade/pom.xml
+++ b/maven-script/maven-script-marmalade/pom.xml
@@ -1,15 +1,12 @@
 <model>
   <parent>
-    <artifactId>maven-script-root</artifactId>
+    <artifactId>maven-script</artifactId>
     <groupId>org.apache.maven</groupId>
     <version>2.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.maven</groupId>
   <artifactId>maven-script-marmalade</artifactId>
-  <packaging>jar</packaging>
   <name>Maven Marmalade Mojo Support</name>
-  <version>2.0-SNAPSHOT</version>
   <dependencies>
     <dependency>
       <groupId>org.apache.maven</groupId>
diff --git a/maven-script/pom.xml b/maven-script/pom.xml
index 0fc605e93e..706232fe34 100644
--- a/maven-script/pom.xml
+++ b/maven-script/pom.xml
@@ -5,8 +5,7 @@
     <version>2.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>maven-script-root</artifactId>
-  <version>2.0-SNAPSHOT</version>
+  <artifactId>maven-script</artifactId>
   <packaging>pom</packaging>
   <name>Maven Script Support Root</name>
   <modules>
diff --git a/maven-settings/pom.xml b/maven-settings/pom.xml
index b6cca380d3..57a8fce39b 100644
--- a/maven-settings/pom.xml
+++ b/maven-settings/pom.xml
@@ -6,7 +6,6 @@
     <version>2.0-SNAPSHOT</version>
   </parent>
   <artifactId>maven-settings</artifactId>
-  <version>2.0-SNAPSHOT</version>
   <name>Maven Local Settings Model</name>
   <dependencies>
     <dependency>
diff --git a/pom.xml b/pom.xml
index 330dc1ff94..e79a429ed6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,17 +6,17 @@
   <name>Maven Project</name>
   <version>2.0-SNAPSHOT</version>
   <description>Maven components parent</description>
-  <url>http://maven.apache.org</url>
+  <url>http://maven.apache.org/maven2/</url>
   <issueManagement>
     <system>jira</system>
-    <url>http://jira.codehaus.org/secure/BrowseProject.jspa?id=10500</url>
+    <url>http://jira.codehaus.org/browse/MNG</url>
   </issueManagement>
   <ciManagement>
-    <system>m2-dev@maven.apache.org</system>
+    <system>continuum</system>
     <notifiers>
       <notifier>
         <type>mail</type>
-        <address>m2-dev@maven.apache.org</address>
+        <address>dev@maven.apache.org</address>
       </notifier>
     </notifiers>
   </ciManagement>
@@ -79,7 +79,6 @@
     <repository>
       <id>repo1</id>
       <name>Maven Central Repository</name>
-      <!-- url>scp://repo1.maven.org/home/projects/maven/repository/ibiblio-v2</url -->
       <url>scp://repo1.maven.org/home/projects/maven/repository-staging/to-ibiblio/maven2</url>
       <layout>default</layout>
     </repository>