diff --git a/maven.xml b/maven.xml
index 687005a7..b6a6e7b7 100644
--- a/maven.xml
+++ b/maven.xml
@@ -16,6 +16,7 @@
  */
  -->
 <project
+  xmlns:i="jelly:interaction"
   xmlns:j="jelly:core">
 
   <goal name="plugins:test-all">
@@ -24,4 +25,16 @@
     <attainGoal name="multiproject:goal"/>
   </goal>
 
+  <goal name="confirm-and-deploy-site">
+    <i:ask 
+      question="Would you like to regenerate and deploy the main plugins site (y/n)?"
+      answer="ok"
+      default="y"
+    />
+    <j:if test="${ok == 'y'}">
+      <attainGoal name="multiproject:site" />
+      <attainGoal name="site:sshdeploy" />
+    </j:if>
+  </goal>
+
 </project>
diff --git a/plugin-parent/maven.xml b/plugin-parent/maven.xml
index c7c73db3..7678d78d 100644
--- a/plugin-parent/maven.xml
+++ b/plugin-parent/maven.xml
@@ -17,6 +17,7 @@
  -->
 <project
   xmlns:ant="jelly:ant"
+  xmlns:j="jelly:core"
   xmlns:maven="jelly:maven">
 
   <!-- XXX: must be a nicer way - maybe SCM can read the POM and recursively checkout parent directories
@@ -26,13 +27,21 @@
   <postGoal name="scm:cvs-checkout-project">
     <maven:pluginVar plugin="maven-scm-plugin" property="maven.scm.checkout.dir" var="dir" />
     <ant:mkdir dir="${dir}/maven-plugins/plugin-parent" />
-    <ant:copy todir="${dir}/maven-plugins/plugin-parent" file="${pom.parent.file}" />
-    <ant:copy todir="${dir}/maven-plugins/plugin-parent" file="${pom.parent.file.parent}/project.properties" />
-    <ant:copy todir="${dir}/maven-plugins/plugin-parent" file="${pom.parent.file.parent}/build.properties" failonerror="false" />
+    <ant:copy todir="${dir}/maven-plugins/plugin-parent">
+      <ant:fileset dir="${pom.parent.file.parent}" />
+    </ant:copy>
     <ant:copy todir="${dir}/maven-plugins" file="${pom.parent.file.parent}/../LICENSE.txt" />
     <ant:copy todir="${dir}/maven-plugins" file="${pom.parent.file.parent}/../NOTICE.txt" />
     <ant:copy todir="${dir}/maven-plugins" file="${pom.parent.file.parent}/../checkstyle.xml" />
     <ant:copy todir="${dir}/maven-plugins" file="${pom.parent.file.parent}/../checkstyle-license.txt" />
+    <j:set var="executionDir" value="${basedir}" scope="parent" />
   </postGoal>
 
+  <postGoal name="site:deploy">
+    <maven:maven
+      descriptor="${executionDir}/../project.xml"
+      goals="confirm-and-deploy-site"
+      ignoreFailures="false"
+    />
+  </postGoal>
 </project>
diff --git a/plugin-parent/project.xml b/plugin-parent/project.xml
index f8f3e70a..0fa7c476 100644
--- a/plugin-parent/project.xml
+++ b/plugin-parent/project.xml
@@ -22,7 +22,7 @@
 
   <pomVersion>3</pomVersion>
   <id>plugin-parent</id>
-  <name>Optional Maven Plugins</name>
+  <name>Maven Plugins</name>
   <groupId>maven</groupId>
   <currentVersion>1.0</currentVersion>
   <organization>
@@ -40,6 +40,7 @@
   <distributionSite>www.apache.org</distributionSite>
   <distributionDirectory>/www/www.apache.org/dist/java-repository/</distributionDirectory>
 
+
   <mailingLists>
     <mailingList>
       <name>Maven User List</name>
diff --git a/project.xml b/project.xml
index 6a4b2554..78ade218 100644
--- a/project.xml
+++ b/project.xml
@@ -21,7 +21,7 @@
 
   <pomVersion>3</pomVersion>
   <id>plugin-parent</id>
-  <name>Optional Maven Plugins</name>
+  <name>Maven Plugins</name>
   <groupId>maven</groupId>
   <currentVersion>1.0</currentVersion>
   <organization>
@@ -160,6 +160,14 @@
     </developer>    
   </developers>
 
+  <dependencies>
+    <dependency>
+      <groupId>commons-jelly</groupId>
+      <artifactId>commons-jelly-tags-interaction</artifactId>
+      <version>20030211.143817</version>
+    </dependency>
+  </dependencies>
+
   <build>
     <sourceDirectory>src/main</sourceDirectory>
     <unitTestSourceDirectory>src/test</unitTestSourceDirectory>