diff --git a/maven-plugin-plugin/pom.xml b/maven-plugin-plugin/pom.xml
index 1f6e9f0..96c8a1e 100644
--- a/maven-plugin-plugin/pom.xml
+++ b/maven-plugin-plugin/pom.xml
@@ -75,7 +75,7 @@
       <version>2.0</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven</groupId>
+        <groupId>org.apache.maven.plugintools</groupId>
       <artifactId>maven-plugin-tools-api</artifactId>
     </dependency>
     <dependency>
@@ -101,12 +101,12 @@
 
     <!-- Maven runtime -->
     <dependency>
-      <groupId>org.apache.maven</groupId>
+      <groupId>org.apache.maven.plugintools</groupId>
       <artifactId>maven-plugin-tools-java</artifactId>
       <scope>runtime</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven</groupId>
+      <groupId>org.apache.maven.plugintools</groupId>
       <artifactId>maven-plugin-tools-beanshell</artifactId>
       <scope>runtime</scope>
     </dependency>
@@ -149,22 +149,22 @@
     <dependencies>
       <!-- maven -->
       <dependency>
-        <groupId>org.apache.maven</groupId>
+        <groupId>org.apache.maven.plugintools</groupId>
         <artifactId>maven-plugin-tools-api</artifactId>
         <version>${pluginToolsVersion}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.maven</groupId>
+        <groupId>org.apache.maven.plugintools</groupId>
         <artifactId>maven-plugin-tools-model</artifactId>
         <version>${pluginToolsVersion}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.maven</groupId>
+        <groupId>org.apache.maven.plugintools</groupId>
         <artifactId>maven-plugin-tools-java</artifactId>
         <version>${pluginToolsVersion}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.maven</groupId>
+        <groupId>org.apache.maven.plugintools</groupId>
         <artifactId>maven-plugin-tools-beanshell</artifactId>
         <version>${pluginToolsVersion}</version>
       </dependency>
@@ -238,7 +238,7 @@
   <properties>
     <doxiaVersion>1.0-alpha-10</doxiaVersion>
     <doxia-sitetoolsVersion>1.0-alpha-10</doxia-sitetoolsVersion>
-    <pluginToolsVersion>2.2-SNAPSHOT</pluginToolsVersion>
+    <pluginToolsVersion>2.4-SNAPSHOT</pluginToolsVersion>
   </properties>
 
   <distributionManagement>
diff --git a/maven-plugin-tools-ant/pom.xml b/maven-plugin-tools-ant/pom.xml
index f2c70a8..2b57e6f 100755
--- a/maven-plugin-tools-ant/pom.xml
+++ b/maven-plugin-tools-ant/pom.xml
@@ -23,9 +23,9 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.apache.maven</groupId>
+    <groupId>org.apache.maven.plugintools</groupId>
     <artifactId>maven-plugin-tools</artifactId>
-    <version>2.2-SNAPSHOT</version>
+    <version>2.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>maven-plugin-tools-ant</artifactId>
@@ -34,16 +34,16 @@
 
   <dependencies>
     <!-- maven -->
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-plugin-tools-api</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-descriptor</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven</groupId>
+      <groupId>org.apache.maven.plugintools</groupId>
+      <artifactId>maven-plugin-tools-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.plugintools</groupId>
       <artifactId>maven-plugin-tools-model</artifactId>
     </dependency>
 
diff --git a/maven-plugin-tools-api/pom.xml b/maven-plugin-tools-api/pom.xml
index b5c7ba8..29453d9 100644
--- a/maven-plugin-tools-api/pom.xml
+++ b/maven-plugin-tools-api/pom.xml
@@ -23,9 +23,9 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.apache.maven</groupId>
+    <groupId>org.apache.maven.plugintools</groupId>
     <artifactId>maven-plugin-tools</artifactId>
-    <version>2.2-SNAPSHOT</version>
+    <version>2.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>maven-plugin-tools-api</artifactId>
diff --git a/maven-plugin-tools-beanshell/pom.xml b/maven-plugin-tools-beanshell/pom.xml
index 9b5f47e..4a2f950 100644
--- a/maven-plugin-tools-beanshell/pom.xml
+++ b/maven-plugin-tools-beanshell/pom.xml
@@ -23,9 +23,9 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.apache.maven</groupId>
+    <groupId>org.apache.maven.plugintools</groupId>
     <artifactId>maven-plugin-tools</artifactId>
-    <version>2.2-SNAPSHOT</version>
+    <version>2.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>maven-plugin-tools-beanshell</artifactId>
@@ -35,7 +35,7 @@
   <dependencies>
     <!-- maven -->
     <dependency>
-      <groupId>org.apache.maven</groupId>
+      <groupId>org.apache.maven.plugintools</groupId>
       <artifactId>maven-plugin-tools-api</artifactId>
     </dependency>
     <dependency>
diff --git a/maven-plugin-tools-java/pom.xml b/maven-plugin-tools-java/pom.xml
index a9edfff..76aa899 100644
--- a/maven-plugin-tools-java/pom.xml
+++ b/maven-plugin-tools-java/pom.xml
@@ -23,9 +23,9 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.apache.maven</groupId>
+    <groupId>org.apache.maven.plugintools</groupId>
     <artifactId>maven-plugin-tools</artifactId>
-    <version>2.2-SNAPSHOT</version>
+    <version>2.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>maven-plugin-tools-java</artifactId>
@@ -46,11 +46,11 @@
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
-      <artifactId>maven-plugin-tools-api</artifactId>
+      <artifactId>maven-plugin-descriptor</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-plugin-descriptor</artifactId>
+      <groupId>org.apache.maven.plugintools</groupId>
+      <artifactId>maven-plugin-tools-api</artifactId>
     </dependency>
 
     <!-- misc -->
diff --git a/maven-plugin-tools-javadoc/pom.xml b/maven-plugin-tools-javadoc/pom.xml
index e433814..50e097f 100644
--- a/maven-plugin-tools-javadoc/pom.xml
+++ b/maven-plugin-tools-javadoc/pom.xml
@@ -23,19 +23,18 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
+    <groupId>org.apache.maven.plugintools</groupId>
     <artifactId>maven-plugin-tools</artifactId>
-    <groupId>org.apache.maven</groupId>
-    <version>2.2-SNAPSHOT</version>
+    <version>2.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>maven-plugin-tools-javadoc</artifactId>
   <name>Maven Plugin Tools Javadoc</name>
-  <version>1.0-SNAPSHOT</version>
   <inceptionYear>2008</inceptionYear>
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.maven</groupId>
+      <groupId>org.apache.maven.plugintools</groupId>
       <artifactId>maven-plugin-tools-java</artifactId>
     </dependency>
   </dependencies>
diff --git a/maven-plugin-tools-javadoc/src/test/resources/unit/javadoc/javadoc-plugin-config.xml b/maven-plugin-tools-javadoc/src/test/resources/unit/javadoc/javadoc-plugin-config.xml
index bd33f5f..f05885c 100644
--- a/maven-plugin-tools-javadoc/src/test/resources/unit/javadoc/javadoc-plugin-config.xml
+++ b/maven-plugin-tools-javadoc/src/test/resources/unit/javadoc/javadoc-plugin-config.xml
@@ -112,7 +112,7 @@ under the License.
           </taglets>
 
           <tagletArtifact>
-            <groupId>org.apache.maven</groupId>
+            <groupId>org.apache.maven.plugintools</groupId>
             <artifactId>maven-plugin-tools-javadoc</artifactId>
             <version>@project.version@</version>
           </tagletArtifact>
diff --git a/maven-plugin-tools-model/pom.xml b/maven-plugin-tools-model/pom.xml
index aef163b..c3819bb 100755
--- a/maven-plugin-tools-model/pom.xml
+++ b/maven-plugin-tools-model/pom.xml
@@ -23,9 +23,9 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.apache.maven</groupId>
+    <groupId>org.apache.maven.plugintools</groupId>
     <artifactId>maven-plugin-tools</artifactId>
-    <version>2.2-SNAPSHOT</version>
+    <version>2.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>maven-plugin-tools-model</artifactId>
diff --git a/pom.xml b/pom.xml
index 8359940..4a553bd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,9 +29,9 @@
     <relativePath>../pom/maven/pom.xml</relativePath>
   </parent>
 
-  <groupId>org.apache.maven</groupId>
+  <groupId>org.apache.maven.plugintools</groupId>
   <artifactId>maven-plugin-tools</artifactId>
-  <version>2.2-SNAPSHOT</version>
+  <version>2.4-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Maven Plugin Tools</name>
@@ -174,22 +174,22 @@
     <dependencies>
       <!-- maven -->
       <dependency>
-        <groupId>org.apache.maven</groupId>
+        <groupId>org.apache.maven.plugintools</groupId>
         <artifactId>maven-plugin-tools-api</artifactId>
         <version>${pluginToolsVersion}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.maven</groupId>
+        <groupId>org.apache.maven.plugintools</groupId>
         <artifactId>maven-plugin-tools-model</artifactId>
         <version>${pluginToolsVersion}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.maven</groupId>
+        <groupId>org.apache.maven.plugintools</groupId>
         <artifactId>maven-plugin-tools-java</artifactId>
         <version>${pluginToolsVersion}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.maven</groupId>
+        <groupId>org.apache.maven.plugintools</groupId>
         <artifactId>maven-plugin-tools-beanshell</artifactId>
         <version>${pluginToolsVersion}</version>
       </dependency>
@@ -230,7 +230,7 @@
   </dependencies>
 
   <properties>
-    <pluginToolsVersion>2.2-SNAPSHOT</pluginToolsVersion>
+    <pluginToolsVersion>2.4-SNAPSHOT</pluginToolsVersion>
     <pluginTestingHarnessVersion>1.1</pluginTestingHarnessVersion>
   </properties>
 </project>