diff --git a/maven-reports/maven-checkstyle-plugin/pom.xml b/maven-reports/maven-checkstyle-plugin/pom.xml
index 980a876d9a..cbadbae32e 100644
--- a/maven-reports/maven-checkstyle-plugin/pom.xml
+++ b/maven-reports/maven-checkstyle-plugin/pom.xml
@@ -1,12 +1,12 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>mojo</artifactId>
+    <artifactId>maven-plugin-parent</artifactId>
     <groupId>org.apache.maven.plugins</groupId>
-    <version>1.0-SNAPSHOT</version>
+    <version>2.0-alpha-2</version>
   </parent>
   <artifactId>maven-checkstyle-plugin</artifactId>
-  <version>1.0-SNAPSHOT</version>
+  <version>2.0-alpha-1-SNAPSHOT</version>
   <packaging>maven-plugin</packaging>
   <name>Maven Checkstyle Plugin</name>
   <inceptionYear>2005</inceptionYear>
@@ -14,17 +14,17 @@
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-project</artifactId>
-      <version>2.0-SNAPSHOT</version>
+      <version>2.0-alpha-2</version>
     </dependency>
     <dependency>
       <groupId>doxia</groupId>
       <artifactId>doxia-core</artifactId>
-      <version>1.0-alpha-2-SNAPSHOT</version>
+      <version>1.0-alpha-2</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.reporting</groupId>
       <artifactId>maven-reporting-api</artifactId>
-      <version>2.0-SNAPSHOT</version>
+      <version>2.0-alpha-2</version>
     </dependency>
     <dependency>
       <groupId>plexus</groupId>
diff --git a/maven-reports/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java b/maven-reports/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java
index eec554930a..6237a333b7 100644
--- a/maven-reports/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java
+++ b/maven-reports/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java
@@ -98,7 +98,8 @@ public void execute()
         if ( StringUtils.isNotEmpty( extraFormatter ) )
         {
             FileOutputStream out;
-            File resultFile = new File( getConfiguration().getOutputDirectory(), resultFileName );
+            // TODO: I removed outputDirectory, and shouldn't have. Put it back here.
+            File resultFile = new File( getConfiguration().getModel().getBuild().getDirectory() + "/site", resultFileName );
             try
             {
                 File parentFile = resultFile.getParentFile();
diff --git a/maven-reports/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReportMojo.java b/maven-reports/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReportMojo.java
index 6b7b0b4605..968965248a 100644
--- a/maven-reports/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReportMojo.java
+++ b/maven-reports/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReportMojo.java
@@ -88,8 +88,6 @@ public void execute()
 
         config.setModel( project.getModel() );
 
-        config.setOutputDirectory( new File( outputDirectory ) );
-
         MavenReport report = new CheckstyleReport();
 
         report.setConfiguration( config );
diff --git a/maven-reports/maven-pmd-plugin/pom.xml b/maven-reports/maven-pmd-plugin/pom.xml
index e17ff2eaf7..0be70f5fb2 100644
--- a/maven-reports/maven-pmd-plugin/pom.xml
+++ b/maven-reports/maven-pmd-plugin/pom.xml
@@ -1,12 +1,12 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>mojo</artifactId>
+    <artifactId>maven-plugin-parent</artifactId>
     <groupId>org.apache.maven.plugins</groupId>
-    <version>1.0-SNAPSHOT</version>
+    <version>2.0-alpha-2</version>
   </parent>
   <artifactId>maven-pmd-plugin</artifactId>
-  <version>1.0-SNAPSHOT</version>
+  <version>2.0-alpha-1-SNAPSHOT</version>
   <packaging>maven-plugin</packaging>
   <name>Maven PMD Plugin</name>
   <inceptionYear>2005</inceptionYear>
@@ -14,17 +14,17 @@
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-project</artifactId>
-      <version>2.0-SNAPSHOT</version>
+      <version>2.0-alpha-2</version>
     </dependency>
     <dependency>
       <groupId>doxia</groupId>
       <artifactId>doxia-core</artifactId>
-      <version>1.0-alpha-2-SNAPSHOT</version>
+      <version>1.0-alpha-2</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.reporting</groupId>
       <artifactId>maven-reporting-api</artifactId>
-      <version>2.0-SNAPSHOT</version>
+      <version>2.0-alpha-2</version>
     </dependency>
     <dependency>
       <groupId>pmd</groupId>
diff --git a/maven-reports/maven-project-info-reports-plugin/pom.xml b/maven-reports/maven-project-info-reports-plugin/pom.xml
index f4aed36f52..9a82ac5ca2 100644
--- a/maven-reports/maven-project-info-reports-plugin/pom.xml
+++ b/maven-reports/maven-project-info-reports-plugin/pom.xml
@@ -1,12 +1,12 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>mojo</artifactId>
+    <artifactId>maven-plugin-parent</artifactId>
     <groupId>org.apache.maven.plugins</groupId>
-    <version>1.0-SNAPSHOT</version>
+    <version>2.0-alpha-2</version>
   </parent>
   <artifactId>maven-project-info-reports-plugin</artifactId>
-  <version>1.0-SNAPSHOT</version>
+  <version>2.0-alpha-1-SNAPSHOT</version>
   <packaging>maven-plugin</packaging>
   <name>Maven Project Info Reports Plugin</name>
   <inceptionYear>2005</inceptionYear>
@@ -14,22 +14,22 @@
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-project</artifactId>
-      <version>2.0-SNAPSHOT</version>
+      <version>2.0-alpha-2</version>
     </dependency>
     <dependency>
       <groupId>doxia</groupId>
       <artifactId>doxia-core</artifactId>
-      <version>1.0-alpha-2-SNAPSHOT</version>
+      <version>1.0-alpha-2</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.reporting</groupId>
       <artifactId>maven-reporting-api</artifactId>
-      <version>2.0-SNAPSHOT</version>
+      <version>2.0-alpha-2</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-model</artifactId>
-      <version>2.0-SNAPSHOT</version>
+      <version>2.0-alpha-2</version>
     </dependency>
   </dependencies>
 </project>
diff --git a/maven-reports/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java b/maven-reports/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java
index 80338c22df..2a1526d3f4 100644
--- a/maven-reports/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java
+++ b/maven-reports/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java
@@ -1,4 +1,4 @@
-package org.apache.maven.reports.projectinfo;
+package org.apache.maven.report.projectinfo;
 
 /*
  * Copyright 2004-2005 The Apache Software Foundation.
diff --git a/maven-reports/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/MailingListsReport.java b/maven-reports/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/MailingListsReport.java
index 3104f6f7c0..c357ae2819 100644
--- a/maven-reports/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/MailingListsReport.java
+++ b/maven-reports/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/MailingListsReport.java
@@ -1,4 +1,4 @@
-package org.apache.maven.reports.projectinfo;
+package org.apache.maven.report.projectinfo;
 
 /*
  * Copyright 2004-2005 The Apache Software Foundation.
diff --git a/maven-reports/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ProjectReportsMojo.java b/maven-reports/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ProjectReportsMojo.java
index 76b17014cb..ddb1298d74 100644
--- a/maven-reports/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ProjectReportsMojo.java
+++ b/maven-reports/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ProjectReportsMojo.java
@@ -1,4 +1,4 @@
-package org.apache.maven.reports.projectinfo;
+package org.apache.maven.report.projectinfo;
 
 /*
  * Copyright 2005 The Apache Software Foundation.
@@ -21,7 +21,6 @@
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.reporting.MavenReport;
 import org.apache.maven.reporting.MavenReportConfiguration;
-import org.apache.maven.reporting.MavenReportException;
 import org.codehaus.doxia.module.xhtml.XhtmlSink;
 import org.codehaus.doxia.site.renderer.SiteRenderer;
 import org.codehaus.plexus.util.FileUtils;
@@ -29,8 +28,8 @@
 import org.codehaus.plexus.util.StringUtils;
 
 import java.io.File;
-import java.io.InputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -88,8 +87,6 @@ public void execute()
 
         config.setModel( project.getModel() );
 
-        config.setOutputDirectory( new File( outputDirectory ) );
-
         MavenReport dependenciesReport = new DependenciesReport();
 
         dependenciesReport.setConfiguration( config );
diff --git a/maven-reports/maven-project-info-reports-plugin/src/main/resources/META-INF/plexus/components.xml b/maven-reports/maven-project-info-reports-plugin/src/main/resources/META-INF/plexus/components.xml
index fa07c9bf74..498ae6906b 100644
--- a/maven-reports/maven-project-info-reports-plugin/src/main/resources/META-INF/plexus/components.xml
+++ b/maven-reports/maven-project-info-reports-plugin/src/main/resources/META-INF/plexus/components.xml
@@ -8,13 +8,13 @@
     <component>
       <role>org.apache.maven.reporting.MavenReport</role>
       <role-hint>dependencies</role-hint>
-      <implementation>org.apache.maven.reports.projectinfo.DependenciesReport</implementation>
+      <implementation>org.apache.maven.report.projectinfo.DependenciesReport</implementation>
       <instantiation-strategy>per-lookup</instantiation-strategy>
     </component>
     <component>
       <role>org.apache.maven.reporting.MavenReport</role>
       <role-hint>mail-lists</role-hint>
-      <implementation>org.apache.maven.reports.projectinfo.MailingListsReport</implementation>
+      <implementation>org.apache.maven.report.projectinfo.MailingListsReport</implementation>
       <instantiation-strategy>per-lookup</instantiation-strategy>
     </component>
   </components>