diff --git a/maven.xml b/maven.xml
index e4dd42c7..0767ca4c 100644
--- a/maven.xml
+++ b/maven.xml
@@ -34,7 +34,4 @@
   <goal name="plugins:deploy-all-sites" description="Create and deploy the web site for all plugins and for the root site">
     <maven:maven descriptor="${basedir}/plugins-site/project.xml" goals="plugins:deploy-all-sites" ignoreFailures="false"/>
   </goal>
-  <goal name="plugins:build-and-deploy-all-sites" description="Create and deploy the web site for all plugins and for the root site">
-    <maven:maven descriptor="${basedir}/plugins-site/project.xml" goals="plugins:build-and-deploy-all-sites" ignoreFailures="false"/>
-  </goal>
 </project>
diff --git a/plugins-site/maven.xml b/plugins-site/maven.xml
index 1adeeea1..64298c01 100644
--- a/plugins-site/maven.xml
+++ b/plugins-site/maven.xml
@@ -17,14 +17,13 @@
  -->
 <project xmlns:ant="jelly:ant" xmlns:i="jelly:interaction" xmlns:j="jelly:core" xmlns:maven="jelly:maven">
   <goal name="plugins:build-all-sites" description="Create the web site for all plugins and for the root site">
+    <!-- And we generate & deploy the root site -->
+    <attainGoal name="multiproject:site"/>
     <!-- We don't use the aggregate mode thus we manually generate all sites -->
     <j:set var="goal" value="site"/>
     <attainGoal name="multiproject:goal"/>
-    <!-- And we generate & deploy the root site -->
-    <attainGoal name="multiproject:site"/>
   </goal>
   <goal name="plugins:deploy-all-sites" description="Deploy the web site for all plugins and for the root site">
-    <!-- We don't want to have the question about to deploy the root site after each plugin -->
     <maven:get var="method" plugin="maven-site-plugin" property="maven.site.deploy.method"/>
     <!-- And we generate & deploy the root site -->
     <attainGoal name="site:${method}deploy"/>
@@ -32,7 +31,6 @@
     <j:set var="goal" value="site:${method}deploy"/>
     <attainGoal name="multiproject:goal"/>
   </goal>
-  <goal name="plugins:build-and-deploy-all-sites" description="Build and deploy the web site for all plugins and for the root site" prereqs="plugins:build-all-sites,plugins:deploy-all-sites"/>
   <goal name="confirm-and-deploy-site">
     <j:if test="${(skipQuestion == null) or not (skipQuestion == 'true')}">
       <i:ask question="Would you like to regenerate and deploy the main plugins site (y/n)?" answer="ok" default="y"/>
diff --git a/plugins-site/project.properties b/plugins-site/project.properties
index 7d0c925c..b13b1111 100644
--- a/plugins-site/project.properties
+++ b/plugins-site/project.properties
@@ -67,7 +67,7 @@ maven.linkcheck.exclude=${pom.repository.url},${maven.changelog.svn.baseurl}
 maven.multiproject.navigation=independent
 maven.multiproject.overviewPage.title=Plugins supplied with Maven
 maven.multiproject.overviewPage.text=The following Maven plugins are available as part of the Maven Project. Please refer also to the list of available <a href="../3rdparty.html">Third Party Plugins</a> and the <a href="../../plugins-sandbox/index.html">Sandbox</a>.
-maven.multiproject.basedir=${basedir}/../
+maven.multiproject.basedir=${basedir}/..
 maven.multiproject.includes=*/project.xml
 maven.multiproject.excludes=plugins-parent/project.xml,plugins-site/project.xml,examples/project.xml,touchstone/project.xml,touchstone-partner/project.xml
 # We can't create the documention for the xdoc plugin because of the relative entity bug in Dom4J