diff --git a/genapp/project.xml b/genapp/project.xml
index 7e53c324..16e2e727 100644
--- a/genapp/project.xml
+++ b/genapp/project.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?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-genapp-plugin</id>
   <name>Maven Genapp Plugin</name>
-  <currentVersion>2.1-SNAPSHOT</currentVersion>
+  <currentVersion>2.1</currentVersion>
   <shortDescription>A collection of example projects showing how to use maven in different situations</shortDescription>
   <url>http://maven.apache.org/reference/plugins/genapp/</url>
   <siteDirectory>/www/maven.apache.org/reference/plugins/genapp/</siteDirectory>
@@ -89,4 +89,11 @@
     <report>maven-license-plugin</report>
     <report>maven-faq-plugin</report>
   </reports>
+  <versions>
+    <version>
+      <id>2.1</id>
+      <name>2.1</name>
+      <tag>MAVEN_GENAPP_2_1</tag>
+    </version>
+  </versions>
 </project>
diff --git a/genapp/xdocs/changes.xml b/genapp/xdocs/changes.xml
index d7705e21..68a2e097 100644
--- a/genapp/xdocs/changes.xml
+++ b/genapp/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.
@@ -23,63 +24,23 @@
     <author email="dion@apache.org">dIon Gillard</author>
   </properties>
   <body>
-    <release version="2.1" date="SNAPSHOT">
-      <action dev="joehni" type="add">
-        Support of configuration files in the template starting 
-        with a dot (e.g. .cvsignore).
-      </action>
-      <action dev="joehni" type="fix">
-        Fix usage of explicit template provided with the property
-        maven.genapp.template.dir. Suppress question for template
-        name, since it is implicit.
-      </action>
-      <action dev="joehni" type="add">
-        Add property maven.genapp.template.repository to support
-        a user-defined location for own templates. This allows a
-        CVS-based template management for a company.
-      </action>
-      <action dev="joehni" type="fix">
-        Fix usage of a comma-separated string as value for property
-        maven.genapp.filter to define multiple files.
-      </action>
-      <action dev="joehni" type="add">
-        Add property maven.genapp.template.user to support the
-        user's account name in the filter with @USER@. The default
-        value is the system property user.name.
-      </action>
-      <action dev="joehni" type="add">
-        Support user-defined parameters for filtering.
-      </action>
-      <action dev="joehni" type="update">
-        Update and improve documentation for properties.
-      </action>
+    <release version="2.1" date="2004-03-10">
+      <action dev="joehni" type="add">Support of configuration files in the template starting with a dot (e.g. .cvsignore).</action>
+      <action dev="joehni" type="fix">Fix usage of explicit template provided with the property maven.genapp.template.dir. Suppress question for template name, since it is implicit.</action>
+      <action dev="joehni" type="add">Add property maven.genapp.template.repository to support a user-defined location for own templates. This allows a CVS-based template management for a company.</action>
+      <action dev="joehni" type="fix">Fix usage of a comma-separated string as value for property maven.genapp.filter to define multiple files.</action>
+      <action dev="joehni" type="add">Add property maven.genapp.template.user to support the user's account name in the filter with @USER@. The default value is the system property user.name.</action>
+      <action dev="joehni" type="add">Support user-defined parameters for filtering.</action>
+      <action dev="joehni" type="update">Update and improve documentation for properties.</action>
     </release>
     <release version="2.0" date="2003-09-29">
-      <action dev="evenisse" type="update">
-        Add a taglib for use the generation in other plugins.
-      </action>
-      <action dev="rhoegg" type="update">
-        Changed property names to maven.genapp.* syntax
-      </action>
-      <action dev="rhoegg" type="update">
-        Prompt the user for project id, name, and package.
-        Don't require command line package specification.
-        This change added a dependency on jelly:interaction.
-      </action>
-      <action dev="rhoegg" type="add">
-        Added initial application template capability.
-        Original idea and implementation was submitted 
-        by Brian Ewins in jira(MAVEN-426).  Modified his jelly to
-        use template directories inside plugin-resources.
-        Added capability for templates to define their
-        own properties.
-      </action>
+      <action dev="evenisse" type="update">Add a taglib for use the generation in other plugins.</action>
+      <action dev="rhoegg" type="update">Changed property names to maven.genapp.* syntax</action>
+      <action dev="rhoegg" type="update">Prompt the user for project id, name, and package. Don't require command line package specification. This change added a dependency on jelly:interaction.</action>
+      <action dev="rhoegg" type="add">Added initial application template capability. Original idea and implementation was submitted by Brian Ewins in jira(MAVEN-426). Modified his jelly to use template directories inside plugin-resources. Added capability for templates to define their own properties.</action>
     </release>
     <release version="1.0" date="2002-12-08">
-      <action dev="jvanzyl" type="add">
-        Initial plugin created
-      </action>
+      <action dev="jvanzyl" type="add">Initial plugin created</action>
     </release>
   </body>
 </document>
-
