diff --git a/xdoc/project.xml b/xdoc/project.xml
index eda7555f..b4ada39f 100644
--- a/xdoc/project.xml
+++ b/xdoc/project.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+
 <!-- 
 /*
  * Copyright 2001-2004 The Apache Software Foundation.
@@ -17,15 +18,13 @@
  */
  -->
 
-
 <project>
   <extend>../project.xml</extend>
   <pomVersion>3</pomVersion>
   <id>maven-xdoc-plugin</id>
   <name>Maven XDoc Plug-in</name>
-  <currentVersion>1.6-SNAPSHOT</currentVersion>
-  <description>Convert xdocs into HTML.
-    Requires Maven 1.0 RC2.</description>
+  <currentVersion>1.6</currentVersion>
+  <description>Convert xdocs into HTML. Requires Maven 1.0 RC2.</description>
   <shortDescription>Convert xdocs into HTML</shortDescription>
   <url>http://maven.apache.org/reference/plugins/xdoc/</url>
   <siteDirectory>/www/maven.apache.org/reference/plugins/xdoc/</siteDirectory>
@@ -40,6 +39,11 @@
       <name>1.5</name>
       <tag>MAVEN_XDOC_1_5</tag>
     </version>
+    <version>
+      <id>1.6</id>
+      <name>1.6</name>
+      <tag>MAVEN_XDOC_1_6</tag>
+    </version>
   </versions>
   <developers>
     <developer>
diff --git a/xdoc/xdocs/changes.xml b/xdoc/xdocs/changes.xml
index 249b95c1..9b4ef992 100644
--- a/xdoc/xdocs/changes.xml
+++ b/xdoc/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,160 +23,58 @@
     <title>Changes</title>
     <author email="dion@multitask.com.au">dIon Gillard</author>
   </properties>
-
   <body>
-    <release version="1.6" date="in CVS">
+    <release version="1.6" date="2004-03-10">
       <action dev="dion" type="fix">Fix google search form flow issues</action>
     </release>
-    
     <release version="1.5" date="2004-02-03">
-      <action dev="dion" type="update">
-        Apply MPXDOC-77.
-        - generated site is valid tableless XHTML with a fully css layout.
-        - Html elements are now used properly: link lists are ul, 
-          titles are h1, h2, etc. 
-        - invalid html produced for sections "name" elements is now fixed, 
-          escaping unvalid chars (replaced by "_"). 
-        - Hrefs for local links (starting with "#") are fixed accordingly during transformation  
-        - whitespace in output has been dramatically reduced (only preserved in sensitive elements 
-          such as pre, script, style
-        - fixes layout during loading in internet explorer: empty images in the 
-          nav bar are popping up with the default blue border and text is 
-          initially unstyled. 
-        - No empty images are used anymore ("handles" for nav bar are created using css)
-        - xdoc:copy-user-resources also copies resource from maven.gen.docs and 
-          not only from maven.docs.src: this allows for reporting plugins to generate
-          images without copying them directly to maven.docs.dest
-        - users can add links _after_ the standard project info/project reports section 
-          setting the "type" attribute to "footer" for the menu element 
-          ($nav/body/menu[@type='footer']) 
-        - development process URL is not included if maven.xdoc.developmentProcessUrl is empty
-        - xhtml fix: missing "alt" attribute for images (required in xhtml) is added automatically
-      </action>
-      <action dev="jvanzyl" type="update">
-        Remove the need for ${pom} interpolation in properties. The use of the
-        maven:property tag is now used to glean a default property.
-      </action>
-      <action dev="dion" type="update">
-        Removed unneeded ant and grant dependencies.
-      </action>
-      <action dev="dion" type="update">
-        Fix MAVEN-965. Document maven.xdoc.jsl.
-      </action>
-      <action dev="dion" type="update">
-        Fix MAVEN-966. Evenly space breadcrumbs, customize separator.
-      </action>
-      <action dev="dion" type="update">
-        Fix MAVEN-962. Better timezone calcs.
-      </action>
-      <action dev="dion" type="update">
-        Fix MAVEN-961. Bad docs entries for maven.docs.dest and maven.gen.docs.
-      </action>
-      <action dev="dion" type="update">
-        Fix MAVEN-964. Add details on date format.
-      </action>
-      <action dev="dion" type="fix">
-        Apply MAVEN-940. Fix excess whitespace.
-      </action>
-      <action dev="dion" type="fix">
-        Fixed empty scm repository and issue tracking URL still being added
-        to the project navigation.
-      </action>
+      <action dev="dion" type="update">Apply MPXDOC-77. - generated site is valid tableless XHTML with a fully css layout. - Html elements are now used properly: link lists are ul, titles are h1, h2, etc. - invalid html produced for sections "name" elements is now fixed, escaping unvalid chars (replaced by "_"). - Hrefs for local links (starting with "#") are fixed accordingly during transformation - whitespace in output has been dramatically reduced (only preserved in sensitive elements such as pre, script, style - fixes layout during loading in internet explorer: empty images in the nav bar are popping up with the default blue border and text is initially unstyled. - No empty images are used anymore ("handles" for nav bar are created using css) - xdoc:copy-user-resources also copies resource from maven.gen.docs and not only from maven.docs.src: this allows for reporting plugins to generate images without copying them directly to maven.docs.dest - users can add links _after_ the standard project info/project reports section setting the "type" attribute to "footer" for the menu element ($nav/body/menu[@type='footer']) - development process URL is not included if maven.xdoc.developmentProcessUrl is empty - xhtml fix: missing "alt" attribute for images (required in xhtml) is added automatically</action>
+      <action dev="jvanzyl" type="update">Remove the need for ${pom} interpolation in properties. The use of the maven:property tag is now used to glean a default property.</action>
+      <action dev="dion" type="update">Removed unneeded ant and grant dependencies.</action>
+      <action dev="dion" type="update">Fix MAVEN-965. Document maven.xdoc.jsl.</action>
+      <action dev="dion" type="update">Fix MAVEN-966. Evenly space breadcrumbs, customize separator.</action>
+      <action dev="dion" type="update">Fix MAVEN-962. Better timezone calcs.</action>
+      <action dev="dion" type="update">Fix MAVEN-961. Bad docs entries for maven.docs.dest and maven.gen.docs.</action>
+      <action dev="dion" type="update">Fix MAVEN-964. Add details on date format.</action>
+      <action dev="dion" type="fix">Apply MAVEN-940. Fix excess whitespace.</action>
+      <action dev="dion" type="fix">Fixed empty scm repository and issue tracking URL still being added to the project navigation.</action>
     </release>
-    
     <release version="1.4" date="2003-09-29">
-      <action dev="dion" type="fix">
-        Applied Maven-756. cvs-usage.xml breaks on non-cvs scm URL
-      </action>
+      <action dev="dion" type="fix">Applied Maven-756. cvs-usage.xml breaks on non-cvs scm URL</action>
       <action dev="dion" type="update">Move xdoc faqs over from the wiki</action>
       <action dev="dion" type="update">update to commons-jelly-20030902.160215</action>
-      <action dev='dion' type='fix'>
-        Move maven.docs.* and maven.gen.docs to defaults.properties instead of xdoc plugin
-      </action>
-      <action dev="evenisse" type="fix">
-        Fix for MAVEN-698. Fix the broken build if repository/connection is not present.
-      </action>
-      <action dev="dion" type="fix">
-        Fixed bug where top level xdocs were using xdocs/navigation.xml instead of the generated
-        one when it was available.
-      </action>
-      <action dev="michal" type="update">
-        Dependency report was completely rewritten.
-        Report generator is now aware of notion of type and groupId.
-        In addition URL and Description (which was also added to the report)
-        of the dependency can be taken from the POM if there is one in the local repository
-      </action>
-      <action dev="michal" type="fix">
-        Documentation of goals ported to new dedicated format
-      </action>
-      <action dev="dion" type="update">
-        update to maven 1.0-beta-10
-      </action>      
-      <action dev="dion" type="update">
-        update to velocity 1.4-dev
-      </action>
-      <action dev="dion" type="update">
-        Upgrade to dom4j 1.4
-      </action>
-      <action dev="evenisse" type="fix">
-        Add xml declaration to generated report. Fixed for character encoding.
-      </action>          
-      <action dev="dion" type="add" due-to="Tim Anderson">
-        Added the google search on navbar as per MAVEN-554
-      </action>
-      <action dev="evenisse" type="fix" due-to="Paulo Silveira">             
-        Fix for Maven-322, remove the space in anchors.
-      </action>
-      <action dev="evenisse" type="fix" due-to="Mark Wilkinson">             
-        Fix for Maven-419, suppress highlight on hover on mozilla on named anchors.
-      </action>
+      <action dev="dion" type="fix">Move maven.docs.* and maven.gen.docs to defaults.properties instead of xdoc plugin</action>
+      <action dev="evenisse" type="fix">Fix for MAVEN-698. Fix the broken build if repository/connection is not present.</action>
+      <action dev="dion" type="fix">Fixed bug where top level xdocs were using xdocs/navigation.xml instead of the generated one when it was available.</action>
+      <action dev="michal" type="update">Dependency report was completely rewritten. Report generator is now aware of notion of type and groupId. In addition URL and Description (which was also added to the report) of the dependency can be taken from the POM if there is one in the local repository</action>
+      <action dev="michal" type="fix">Documentation of goals ported to new dedicated format</action>
+      <action dev="dion" type="update">update to maven 1.0-beta-10</action>
+      <action dev="dion" type="update">update to velocity 1.4-dev</action>
+      <action dev="dion" type="update">Upgrade to dom4j 1.4</action>
+      <action dev="evenisse" type="fix">Add xml declaration to generated report. Fixed for character encoding.</action>
+      <action dev="dion" type="add" due-to="Tim Anderson">Added the google search on navbar as per MAVEN-554</action>
+      <action dev="evenisse" type="fix" due-to="Paulo Silveira">Fix for Maven-322, remove the space in anchors.</action>
+      <action dev="evenisse" type="fix" due-to="Mark Wilkinson">Fix for Maven-419, suppress highlight on hover on mozilla on named anchors.</action>
     </release>
     <release version="1.3" date="Unknown">
-      <action dev="michal" type="add" due-to="Kuisong Tong">             
-        Fix for Maven-383, target encoding can be set for files
-        generated from POM.
-      </action>
-      
-      <action dev="dion" type="add">
-        Added a target to validate the navigation.xml files from the schema
-      </action>
-      <action dev="vmassol" type="add">
-        Added Cactus reports to Project Reports
-      </action>
-      <action dev="vmassol" type="add">
-        Added new <code>$gen-xdocs</code>variable in the Velocity context
-        used to generate the templates files. It points to the location
-        where generated xdocs are located.
-      </action>
-      <action dev="evenisse" type="update">
-        Added maven.xdoc.development-process-url properties.
-      </action>
-      <action dev="dion" type="add">
-        Added Javadoc report to Project Reports
-      </action>
-      <action dev="dion" type="fix">
-        Fix table widths of changelog and changes reports
-      </action>
-      <action dev="dion" type="fix">
-        Fix for Maven-124, the navbar was out of sync with maven-reports.xml
+      <action dev="michal" type="add" due-to="Kuisong Tong">Fix for Maven-383, target encoding can be set for files generated from POM.</action>
+      <action dev="dion" type="add">Added a target to validate the navigation.xml files from the schema</action>
+      <action dev="vmassol" type="add">Added Cactus reports to Project Reports</action>
+      <action dev="vmassol" type="add">Added new
+        <code>$gen-xdocs</code>variable in the Velocity context used to generate the templates files. It points to the location where generated xdocs are located.
       </action>
+      <action dev="evenisse" type="update">Added maven.xdoc.development-process-url properties.</action>
+      <action dev="dion" type="add">Added Javadoc report to Project Reports</action>
+      <action dev="dion" type="fix">Fix table widths of changelog and changes reports</action>
+      <action dev="dion" type="fix">Fix for Maven-124, the navbar was out of sync with maven-reports.xml</action>
     </release>
     <release version="1.2" date="2002-10-01">
-      <action dev="evenisse" type="update">
-        Created link with development process page if development-process.xml
-        exist in xdocs directory, otherwise a link with development process
-        page on Maven site.
-      </action>
-      <action dev="dion" type="add">
-        Added documentation for the new changes report.
-      </action>
-      <action dev="vmassol" type="add">
-        Added the new <a href="changes-report.html">changes report</a>.
-      </action>
-      <action dev="vmassol" type="add">
-        Added an id column for committers on the team-list page.
+      <action dev="evenisse" type="update">Created link with development process page if development-process.xml exist in xdocs directory, otherwise a link with development process page on Maven site.</action>
+      <action dev="dion" type="add">Added documentation for the new changes report.</action>
+      <action dev="vmassol" type="add">Added the new
+        <a href="changes-report.html">changes report</a>.
       </action>
+      <action dev="vmassol" type="add">Added an id column for committers on the team-list page.</action>
     </release>
   </body>
 </document>
-
