diff --git a/aspectj/project.xml b/aspectj/project.xml
index 8e6b1365..2c025793 100644
--- a/aspectj/project.xml
+++ b/aspectj/project.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+
 <!-- 
 /*
  * Copyright 2001-2004 The Apache Software Foundation.
@@ -17,13 +18,12 @@
  */
  -->
 
-
 <project>
   <extend>../project.xml</extend>
   <pomVersion>3</pomVersion>
   <id>maven-aspectj-plugin</id>
   <name>Maven AspectJ Plug-in</name>
-  <currentVersion>2.0-SNAPSHOT</currentVersion>
+  <currentVersion>2.0</currentVersion>
   <description/>
   <shortDescription>Eclipse Plugin for AspectJ</shortDescription>
   <url>http://maven.apache.org/reference/plugins/aspectj/</url>
@@ -45,6 +45,11 @@
       <name>2.0</name>
       <tag>HEAD</tag>
     </version>
+    <version>
+      <id>2.0</id>
+      <name>2.0</name>
+      <tag>MAVEN_ASPECTJ_2_0</tag>
+    </version>
   </versions>
   <developers>
     <developer>
diff --git a/aspectj/xdocs/changes.xml b/aspectj/xdocs/changes.xml
index 6f25d1d7..8d5a4bf2 100644
--- a/aspectj/xdocs/changes.xml
+++ b/aspectj/xdocs/changes.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
+
 <!-- 
 /*
  * Copyright 2001-2004 The Apache Software Foundation.
@@ -22,27 +23,19 @@
     <title>AspectJ plugin changes</title>
     <author email="dion@multitask.com.au">dIon Gillard</author>
     <author email="vmassol@pivolis.com">Vincent Massol</author>
-    <author email="jason@maven.org">Jason van Zyl</author>    
+    <author email="jason@maven.org">Jason van Zyl</author>
   </properties>
-
   <body>
-    <release version="2.0" date="in CVS">
-      <action dev="vmassol" type="add">
-        Complete rewrite of the plugin. Now using AspectJ 1.1 and performing
-        binary weaving on jar generated by the <code>jar:jar</code> goal. Also
-        supports creation and weaving-in of reusable aspect libraries.
+    <release version="2.0" date="2004-03-10">
+      <action dev="vmassol" type="add">Complete rewrite of the plugin. Now using AspectJ 1.1 and performing binary weaving on jar generated by the
+        <code>jar:jar</code>goal. Also supports creation and weaving-in of reusable aspect libraries.
       </action>
     </release>
     <release version="1.1" date="2003-09-21">
-      <action dev="dion" type="add">
-        Added documentation for navigation, changes, properties and goals
-      </action>
+      <action dev="dion" type="add">Added documentation for navigation, changes, properties and goals</action>
     </release>
     <release version="1.0" date="2002-07-16">
-      <action dev="jvanzyl" type="add">
-        Original release for Maven 1.0-beta6
-      </action>
+      <action dev="jvanzyl" type="add">Original release for Maven 1.0-beta6</action>
     </release>
   </body>
 </document>
-
