diff --git a/maven-plugin-tools/pom.xml b/maven-plugin-tools/pom.xml
index 2e7dc0cdd9..e4d1336d60 100644
--- a/maven-plugin-tools/pom.xml
+++ b/maven-plugin-tools/pom.xml
@@ -1,4 +1,4 @@
-<model>
+<project>
   <parent>
     <artifactId>maven-component</artifactId>
     <groupId>org.apache.maven</groupId>
@@ -6,9 +6,9 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>maven-plugin-tools</artifactId>
-  <packaging>jar</packaging>
-  <name>Maven Plugin Tools Base POM</name>
   <version>2.0-SNAPSHOT</version>
+  <packaging>pom</packaging>
+  <name>Maven Plugin Tools Base POM</name>
   <dependencies>
     <dependency>
       <groupId>org.apache.maven</groupId>
@@ -39,4 +39,10 @@
       <scope>compile</scope>
     </dependency>
   </dependencies>
-</model>
+  <modules>
+    <module>maven-plugin-tools-api</module>
+    <module>maven-plugin-tools-java</module>
+    <module>maven-plugin-tools-marmalade</module>
+    <module>maven-plugin-tools-pluggy</module>
+  </modules>
+</project>
diff --git a/maven-plugins/pom.xml b/maven-plugins/pom.xml
index 4fdf30c4c0..f1e9251648 100644
--- a/maven-plugins/pom.xml
+++ b/maven-plugins/pom.xml
@@ -1,10 +1,10 @@
-<model>
+<project>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.maven.plugins</groupId>
   <artifactId>maven-plugin-parent</artifactId>
   <packaging>pom</packaging>
-  <name>Maven Plugin</name>
   <version>2.0-SNAPSHOT</version>
+  <name>Maven Plugin</name>
   <description>Maven plugin parent</description>
   <url>http://maven.apache.org</url>
   <issueManagement>
@@ -66,4 +66,17 @@
       <url>scp://repo1.maven.org/home/projects/maven/repository/ibiblio-v2</url>
     </repository>
   </distributionManagement>
-</model>
+  <modules>
+    <module>maven-assemble-plugin</module>
+    <module>maven-clean-plugin</module>
+    <module>maven-compiler-plugin</module>
+    <module>maven-deploy-plugin</module>
+    <module>maven-ejb-plugin</module>
+    <module>maven-install-plugin</module>
+    <module>maven-jar-plugin</module>
+    <module>maven-plugin-plugin</module>
+    <module>maven-resources-plugin</module>
+    <module>maven-surefire-plugin</module>
+    <module>maven-war-plugin</module>
+  </modules>
+</project>
diff --git a/maven-script/pom.xml b/maven-script/pom.xml
index 5eaab27050..dc299703e7 100644
--- a/maven-script/pom.xml
+++ b/maven-script/pom.xml
@@ -1,4 +1,4 @@
-<model>
+<project>
   <parent>
     <artifactId>maven-component</artifactId>
     <groupId>org.apache.maven</groupId>
@@ -6,9 +6,9 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>maven-script-root</artifactId>
-  <packaging>jar</packaging>
-  <name>Maven Script Support Root</name>
   <version>2.0-SNAPSHOT</version>
+  <packaging>pom</packaging>
+  <name>Maven Script Support Root</name>
   <dependencies>
     <dependency>
       <groupId>org.apache.maven</groupId>
@@ -25,4 +25,7 @@
       <scope>compile</scope>
     </dependency>
   </dependencies>
-</model>
+  <modules>
+    <module>maven-script-marmalade</module>
+  </modules>
+</project>