diff --git a/cactus/project.xml b/cactus/project.xml
index dda7d859..a0656c72 100644
--- a/cactus/project.xml
+++ b/cactus/project.xml
@@ -5,7 +5,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-cactus-plugin</id>
   <name>Maven Cactus Plug-in</name>
-  <currentVersion>2.0-SNAPSHOT</currentVersion>
+  <currentVersion>2.0</currentVersion>
   <description>Plugin for Cactus (http://jakarta.apache.org/cactus) that allows to automatically start containers, run Cactus tests and stop the containers.</description>
   <shortDescription>Cactus plugin</shortDescription>
   <url>http://maven.apache.org/reference/plugins/cactus/</url>
@@ -36,7 +36,7 @@
     <version>
       <id>2.0</id>
       <name>2.0</name>
-      <tag>HEAD</tag>
+      <tag>MAVEN_CACTUS_2_0</tag>
     </version>
   </versions>
 
diff --git a/cactus/xdocs/changes.xml b/cactus/xdocs/changes.xml
index 0904e6fa..dcb518ef 100644
--- a/cactus/xdocs/changes.xml
+++ b/cactus/xdocs/changes.xml
@@ -2,15 +2,17 @@
 <document>
   <properties>
     <title>Changes</title>
-    <author email="vmassol@octo.com">Vincent Massol</author>
+    <author email="vmassol@apache.org">Vincent Massol</author>
   </properties>
 
   <body>
 
-    <release version="2.0" date="in CVS">
+    <release version="2.0" date="2003-04-08">
       <action dev="vmassol" type="update">
-        Complete rework of the plugin to use the Cactus Ant Integration
-        module from the Cactus project.
+        Complete rework of the plugin to use the Cactus/Ant Integration
+        module from the Cactus project. Now using Cactus 1.5dev for J2EE
+        1.3, built from CVS on 7th of April 2003. Thus the Plugin feature
+        are now those of the Cactus/Ant Integration module.
       </action>              
     </release>
 
diff --git a/cactus/xdocs/features.xml b/cactus/xdocs/features.xml
index 0d1657a3..d924d2de 100644
--- a/cactus/xdocs/features.xml
+++ b/cactus/xdocs/features.xml
@@ -3,7 +3,7 @@
 
   <properties>
     <title>Features of the Cactus plugin</title>
-    <author email="vmassol@octo.com">Vincent Massol</author>
+    <author email="vmassol@apache.org">Vincent Massol</author>
   </properties>
 
   <body>
diff --git a/cactus/xdocs/goals.xml b/cactus/xdocs/goals.xml
index b3629570..4d93e899 100644
--- a/cactus/xdocs/goals.xml
+++ b/cactus/xdocs/goals.xml
@@ -4,6 +4,7 @@
   <properties>
     <title>Maven cactus Plug-in Goals</title>
     <author email="dion@apache.org">dIon Gillard</author>
+    <author email="vmassol@apache.org">Vincent Massol</author>
   </properties>
   <body>
     <goals>
diff --git a/cactus/xdocs/index.xml b/cactus/xdocs/index.xml
index 1ccaa20f..f6a8dd5d 100644
--- a/cactus/xdocs/index.xml
+++ b/cactus/xdocs/index.xml
@@ -3,7 +3,7 @@
 
   <properties>
     <title>Maven Cactus Plug-in</title>
-    <author email="vmassol@octo.com">Vincent Massol</author>
+    <author email="vmassol@apache.org">Vincent Massol</author>
   </properties>
 
   <body>
@@ -24,6 +24,12 @@
           <th>Date</th>
           <th>Description</th>
         </tr>
+        <tr>
+          <td>08 Apr 2003</td>
+          <td>
+            Release of version 2.0.
+          </td>
+        </tr>
         <tr>
           <td>22 Mar 2003</td>
           <td>
diff --git a/cactus/xdocs/navigation.xml b/cactus/xdocs/navigation.xml
index 451488a4..049f9cd3 100644
--- a/cactus/xdocs/navigation.xml
+++ b/cactus/xdocs/navigation.xml
@@ -15,9 +15,10 @@
       <item name="Properties" href="/properties.html"/>
     </menu>
     <menu name="Downloads">
-      <item name="Cactus Plugin 1.0" href="http://www.ibiblio.org/maven/maven/jars/maven-cactus-plugin-1.0.jar"/>
-      <item name="Cactus Plugin 1.1" href="http://www.ibiblio.org/maven/maven/jars/maven-cactus-plugin-1.1.jar"/>
+      <item name="Cactus Plugin 2.0" href="http://www.ibiblio.org/maven/maven/jars/maven-cactus-plugin-2.0.jar"/>
       <item name="Cactus Plugin 1.2" href="http://www.ibiblio.org/maven/maven/jars/maven-cactus-plugin-1.2.jar"/>
+      <item name="Cactus Plugin 1.1" href="http://www.ibiblio.org/maven/maven/jars/maven-cactus-plugin-1.1.jar"/>
+      <item name="Cactus Plugin 1.0" href="http://www.ibiblio.org/maven/maven/jars/maven-cactus-plugin-1.0.jar"/>
     </menu>
   </body>
 </project>
diff --git a/cactus/xdocs/properties.xml b/cactus/xdocs/properties.xml
index 62fb49b2..13f3ee1d 100644
--- a/cactus/xdocs/properties.xml
+++ b/cactus/xdocs/properties.xml
@@ -4,6 +4,7 @@
   <properties>
     <title>Cactus Properties</title>
     <author email="dion@apache.org">dIon Gillard</author>
+    <author email="vmassol@apache.org">Vincent Massol</author>
   </properties>
   <body>
     <section name="Cactus Settings">
diff --git a/cactus/xdocs/tasks.xml b/cactus/xdocs/tasks.xml
index a39557cc..929ef8c9 100644
--- a/cactus/xdocs/tasks.xml
+++ b/cactus/xdocs/tasks.xml
@@ -3,7 +3,7 @@
 
   <properties>
     <title>Tasks</title>
-    <author email="vmassol@octo.com">Vincent Massol</author>
+    <author email="vmassol@apache.org">Vincent Massol</author>
   </properties>
 
   <body>
diff --git a/cactus/xdocs/using.xml b/cactus/xdocs/using.xml
index d8dd6333..a8c30738 100644
--- a/cactus/xdocs/using.xml
+++ b/cactus/xdocs/using.xml
@@ -3,7 +3,7 @@
 
   <properties>
     <title>Using the Maven Cactus Plug-in</title>
-    <author email="vmassol@octo.com">Vincent Massol</author>
+    <author email="vmassol@apache.org">Vincent Massol</author>
   </properties>
 
   <body>