diff --git a/maven.xml b/maven.xml
index b6a6e7b7..54a2bebb 100644
--- a/maven.xml
+++ b/maven.xml
@@ -16,6 +16,7 @@
  */
  -->
 <project
+  xmlns:ant="jelly:ant"
   xmlns:i="jelly:interaction"
   xmlns:j="jelly:core">
 
@@ -37,4 +38,8 @@
     </j:if>
   </goal>
 
+  <postGoal name="site">
+    <ant:move file="${maven.docs.dest}/projects-overview.html" tofile="${maven.docs.dest}/index.html" />
+  </postGoal>
+
 </project>
diff --git a/project.properties b/project.properties
index 8eabb5c4..04e87958 100644
--- a/project.properties
+++ b/project.properties
@@ -33,8 +33,8 @@ maven.clover.report.xml=true
 # Multiproject plugin settings
 maven.multiproject.navigation=independent
 maven.multiproject.overviewPage.title=Maven Plugins
-maven.multiproject.overviewPage.link=plugins
-maven.multiproject.overviewPage.text=The following Maven plugins are available:
+#maven.multiproject.overviewPage.link=index
+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>.
 maven.multiproject.excludes=plugin-parent/project.xml,examples/project.xml
 
 maven.xdoc.date = left
diff --git a/xdocs/index.xml b/xdocs/index.xml
deleted file mode 100644
index 214d7812..00000000
--- a/xdocs/index.xml
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0"?>
-<!-- 
-/*
- * Copyright 2001-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-
-
-<document>
-
-  <properties>
-    <title>Maven plugins</title>
-    <author email="emmanuel@venisse.net">Emmanuel Venisse</author>
-  </properties>
-
-  <body>
-    <section name="Maven plugins">
-      <p>
-        This page contains a list of known plugins site. We would be
-        very interested if you would drop us a note if you are creating
-        a Maven plugin and would like to be added to this list.
-      </p>
-      <subsection name="Plugins hosted by Maven">
-        <table>
-          <tr>
-            <td style="width:25%"><a href="plugins.html">Maven plugins</a></td>
-            <td style="width:75%"></td>
-          </tr>
-        </table>
-      </subsection>
-      <subsection name="Plugins on the Cactus site">
-        <table>
-          <tr>
-            <td style="width:25%"><a href="http://jakarta.apache.org/cactus/integration/maven/">Cactus plugin</a></td>
-            <td style="width:75%">Plugin for Cactus</td>
-          </tr>
-        </table>
-      </subsection>
-      <subsection name="Plugins on the Codeczar site">
-        <table>
-          <tr>
-            <td style="width:25%"><a href="http://www.codeczar.com/products/maven-ejbgen-plugin/">Weblogic EJBGen plugin</a></td>
-            <td style="width:75%">Plugin for Weblogic EJBGen</td>
-          </tr>
-          <tr>
-            <td style="width:25%"><a href="http://www.codeczar.com/products/maven-tomcat-plugin/">Tomcat plugin</a></td>
-            <td style="width:75%">Plugin for managing webapps with Tomcat Manager</td>
-          </tr>                  
-        </table>
-      </subsection>
-      <subsection name="Plugins on the CSDL site">
-        <table>
-          <tr>
-            <td style="width:25%"><a href="http://csdl.ics.hawaii.edu/Tools/JBlanket/maven-plugin/">JBlanket plugin</a></td>
-            <td style="width:75%">Plugin for JBlanket test coverage tool</td>
-          </tr>
-        </table>
-      </subsection>
-      <subsection name="Plugins on SourceForge">
-        <table>
-          <tr>
-            <td style="width:25%"><a href="http://maven-plugins.sourceforge.net/">Maven-Plugins</a></td>
-            <td style="width:75%">Various plugins</td> <!-- todo text list? -->
-          </tr>
-          <tr>
-            <td style="width:25%"><a href="http://maven-validator.sourceforge.net/">Maven Validator</a></td>
-            <td style="width:75%">Validates XHTML</td>
-          </tr>
-          <tr>
-            <td style="width:25%"><a href="http://xdoclet.sourceforge.net/maven-plugin.html">XDoclet plugin</a></td>
-            <td style="width:75%">Plugin for XDoclet</td>
-          </tr>
-          <tr>
-            <td style="width:25%"><a href="http://maven-taglib.sourceforge.net/">Maven Taglib plugin</a></td>
-            <td style="width:75%">Taglib Plug-in is a maven plugin for jsp tag libraries developers</td>
-          </tr>
-          <tr>
-            <td style="width:25%"><a href="http://xframe.sourceforge.net/xsddoc/">Maven xsddoc plugin</a></td>
-            <td style="width:75%">Generates documentation of W3C XML Schema</td>
-          </tr>
-          <tr>
-            <td style="width:25%"><a href="http://maven-doccheck.sourceforge.net/">Maven DocCheck Plugin</a></td>
-            <td style="width:75%">Plugin for Doc Check Doclet</td>
-          </tr>
-        </table>
-      </subsection>
-      <subsection name="Plugins on Berlios">
-        <table>
-          <tr>
-            <td style="width:25%"><a href="http://statcvs-xml.berlios.de/">StatCvs-XML plugin</a></td>
-            <td style="width:75%">Plugin for StatCvs-XML</td>
-          </tr>
-        </table>
-      </subsection>
-      <subsection name="Plugins on Codehaus">
-        <table>
-	      <tr>
-	        <td style="width:25%"><a href="http://mevenide.codehaus.org/maven-nbm-plugin">Maven NBM plugin</a></td>
-          <td style="width:75%">Plugin for creating Netbeans modules (both jars and NBMs) and autoupdate sites.</td>
-	      </tr>
-	    </table>
-      </subsection>
-    </section>
-    <section name="IDE Plugins for Maven">
-      <table>
-        <tr>
-          <td style="width:25%"><a href="http://mevenide.codehaus.org/">Mevenide</a></td>
-          <td style="width:75%">Mevenide (Maven IDE Integration) aims at integrating Maven into standard IDEs. Currently Eclipse and Netbeans are targeted.</td>
-        </tr>
-      </table>
-    </section>
-    <section name="Plugins hosted elsewhere">
-      <table>
-        <tr>
-          <td style="width:25%"><a href="http://www.itbrain.com.mx/ucdd">UCDD</a></td>
-          <td style="width:75%">Document Use Cases using maven and xml.</td>
-        </tr>
-      </table>
-    </section>
-  </body>
-</document>
diff --git a/xdocs/navigation.xml b/xdocs/navigation.xml
index 5d547616..57ed3edd 100644
--- a/xdocs/navigation.xml
+++ b/xdocs/navigation.xml
@@ -27,8 +27,7 @@
       <item name="Maven"                   href="http://maven.apache.org/index.html"/>
     </links>
    <menu name="Overview">
-      <item name="About"                   href="/index.html"/>
-      <item name="Plugins"                 href="/plugins.html"/>
+      <item name="Plugins"                 href="/index.html"/>
       <item name="FAQ"                     href="/faq.html"/>
     </menu>
   </body>

Weblogic EJBGen plugin	Plugin for Weblogic EJBGen
Tomcat plugin	Plugin for managing webapps with Tomcat Manager
Maven-Plugins	Various plugins
Maven Validator	Validates XHTML
XDoclet plugin	Plugin for XDoclet
Maven Taglib plugin	Taglib Plug-in is a maven plugin for jsp tag libraries developers
Maven xsddoc plugin	Generates documentation of W3C XML Schema
Maven DocCheck Plugin	Plugin for Doc Check Doclet