diff --git a/clean/clean/plugin.jelly b/clean/clean/plugin.jelly
index 3c92c523..6a98b3c0 100644
--- a/clean/clean/plugin.jelly
+++ b/clean/clean/plugin.jelly
@@ -15,14 +15,14 @@
   
   <goal name="clean:classes"
          description="Remove all build and test classes">
-    <ant:delete dir="maven.build.dest"/>
-    <ant:delete dir="maven.test.dest"/>
+    <ant:delete dir="${maven.build.dest}"/>
+    <ant:delete dir="${maven.test.dest}"/>
   </goal>
   
   <goal name="clean:docs"
          description="Remove all docs and generated xdocs">
-    <ant:delete dir="maven.gen.docs"/>
-    <ant:delete dir="maven.docs.dest"/>
+    <ant:delete dir="${maven.gen.docs}"/>
+    <ant:delete dir="${maven.docs.dest}"/>
   </goal>
 
 </project>
diff --git a/clean/clean/project.properties b/clean/clean/project.properties
index c43339ba..fc4158e6 100644
--- a/clean/clean/project.properties
+++ b/clean/clean/project.properties
@@ -1,3 +1,7 @@
 # -------------------------------------------------------------------
 # P R O J E C T  P R O P E R T I E S
 # -------------------------------------------------------------------
+maven.xdoc.date=left
+maven.xdoc.version=${pom.currentVersion}
+#maven.xdoc.developmentProcessUrl=http://maven.apache.org/development-process.html
+maven.license.licenseFile=${basedir}/../../../LICENSE.txt
diff --git a/clean/clean/project.xml b/clean/clean/project.xml
index 1db21b0a..1ef8f0c1 100644
--- a/clean/clean/project.xml
+++ b/clean/clean/project.xml
@@ -5,9 +5,9 @@
   <pomVersion>3</pomVersion>
   <id>maven-clean-plugin</id>
   <name>Maven Clean Plug-in</name>
-  <currentVersion>1.0</currentVersion>
+  <currentVersion>1.1-SNAPSHOT</currentVersion>
   <description/>
-  <shortDescription>Java Project Management Tools</shortDescription>
+  <shortDescription>Clean plugin for Maven</shortDescription>
   <url>http://maven.apache.org/reference/plugins/clean/</url>
   <siteDirectory>/www/maven.apache.org/reference/plugins/clean/</siteDirectory>
   <repository>
diff --git a/clean/clean/xdocs/changes.xml b/clean/clean/xdocs/changes.xml
index 85f499d8..f68b297e 100644
--- a/clean/clean/xdocs/changes.xml
+++ b/clean/clean/xdocs/changes.xml
@@ -6,13 +6,17 @@
   </properties>
 
   <body>
-    
-    <release version="1.0" date="in cvs">
+    <release version="1.1" date="in cvs">
+      <action dev="dion" type="fix" due-to="gabriel">
+        Apply docs patch, fix bad code in the clean:classes and clean:docs goals
+      </action>
+    </release>
+    <release version="1.0" date="Unknown">
       <action dev="evenisse" type="add">
         Add clean:classes and clean:docs goals.
       </action>
       <action dev="evenisse" type="add">
-        Initial plugin created. Goals are move from java plugin.
+        Initial plugin created. Goals are moved from java plugin.
       </action>
     </release>
     
diff --git a/clean/clean/xdocs/goals.xml b/clean/clean/xdocs/goals.xml
index 9bacefbd..119327ce 100644
--- a/clean/clean/xdocs/goals.xml
+++ b/clean/clean/xdocs/goals.xml
@@ -7,23 +7,25 @@
   </properties>
 
   <body>
-    <section name="Goals">
-      <table>
-        <tr><th>Goal</th><th>Description</th></tr>
-        <tr>
-          <td>clean</td>
-          <td>
-            This goal is a shortcut to the <code>clean:clean</code> goal
-          </td>
-        </tr>
-        <tr>
-          <td>clean:clean</td>
-          <td>
-            Removes the <a href="properties.html">maven.build.dir</a> and 
-            <a href="properties.html">maven.test.reportsDirectory</a> directories
-          </td>
-        </tr>
-      </table>
-    </section>
- </body>
+    <goals>
+      <goal>
+        <name>clean</name>
+        <description>
+          This goal is a shortcut to the <code>clean:clean</code> goal.
+        </description>
+      </goal>
+      <goal>
+        <name>clean:clean</name>
+        <description>Removes ${maven.build.dir} and ${basedir}/velocity.log.</description>
+      </goal>
+      <goal>
+        <name>clean:classes</name>
+        <description>Removes ${maven.build.dest} and ${maven.test.dest} directories.</description>
+      </goal>
+      <goal>
+        <name>clean:docs</name>
+        <description>Removes the ${maven.gen.docs} and ${maven.docs.dest} directories.</description>
+      </goal>
+    </goals>
+  </body>
 </document>
diff --git a/clean/clean/xdocs/index.xml b/clean/clean/xdocs/index.xml
index 70ea0493..1c2c0b00 100644
--- a/clean/clean/xdocs/index.xml
+++ b/clean/clean/xdocs/index.xml
@@ -9,7 +9,7 @@
   <body>
     <section name="Clean Java Plug-in">
       <p>
-        This plug-in provides functionality for cleaning output directory.
+        This plug-in provides functionality for cleaning output directories.
       </p>
     </section>
  </body>
diff --git a/clean/plugin.jelly b/clean/plugin.jelly
index 3c92c523..6a98b3c0 100644
--- a/clean/plugin.jelly
+++ b/clean/plugin.jelly
@@ -15,14 +15,14 @@
   
   <goal name="clean:classes"
          description="Remove all build and test classes">
-    <ant:delete dir="maven.build.dest"/>
-    <ant:delete dir="maven.test.dest"/>
+    <ant:delete dir="${maven.build.dest}"/>
+    <ant:delete dir="${maven.test.dest}"/>
   </goal>
   
   <goal name="clean:docs"
          description="Remove all docs and generated xdocs">
-    <ant:delete dir="maven.gen.docs"/>
-    <ant:delete dir="maven.docs.dest"/>
+    <ant:delete dir="${maven.gen.docs}"/>
+    <ant:delete dir="${maven.docs.dest}"/>
   </goal>
 
 </project>
diff --git a/clean/project.properties b/clean/project.properties
index c43339ba..fc4158e6 100644
--- a/clean/project.properties
+++ b/clean/project.properties
@@ -1,3 +1,7 @@
 # -------------------------------------------------------------------
 # P R O J E C T  P R O P E R T I E S
 # -------------------------------------------------------------------
+maven.xdoc.date=left
+maven.xdoc.version=${pom.currentVersion}
+#maven.xdoc.developmentProcessUrl=http://maven.apache.org/development-process.html
+maven.license.licenseFile=${basedir}/../../../LICENSE.txt
diff --git a/clean/project.xml b/clean/project.xml
index 1db21b0a..1ef8f0c1 100644
--- a/clean/project.xml
+++ b/clean/project.xml
@@ -5,9 +5,9 @@
   <pomVersion>3</pomVersion>
   <id>maven-clean-plugin</id>
   <name>Maven Clean Plug-in</name>
-  <currentVersion>1.0</currentVersion>
+  <currentVersion>1.1-SNAPSHOT</currentVersion>
   <description/>
-  <shortDescription>Java Project Management Tools</shortDescription>
+  <shortDescription>Clean plugin for Maven</shortDescription>
   <url>http://maven.apache.org/reference/plugins/clean/</url>
   <siteDirectory>/www/maven.apache.org/reference/plugins/clean/</siteDirectory>
   <repository>
diff --git a/clean/xdocs/changes.xml b/clean/xdocs/changes.xml
index 85f499d8..f68b297e 100644
--- a/clean/xdocs/changes.xml
+++ b/clean/xdocs/changes.xml
@@ -6,13 +6,17 @@
   </properties>
 
   <body>
-    
-    <release version="1.0" date="in cvs">
+    <release version="1.1" date="in cvs">
+      <action dev="dion" type="fix" due-to="gabriel">
+        Apply docs patch, fix bad code in the clean:classes and clean:docs goals
+      </action>
+    </release>
+    <release version="1.0" date="Unknown">
       <action dev="evenisse" type="add">
         Add clean:classes and clean:docs goals.
       </action>
       <action dev="evenisse" type="add">
-        Initial plugin created. Goals are move from java plugin.
+        Initial plugin created. Goals are moved from java plugin.
       </action>
     </release>
     
diff --git a/clean/xdocs/goals.xml b/clean/xdocs/goals.xml
index 9bacefbd..119327ce 100644
--- a/clean/xdocs/goals.xml
+++ b/clean/xdocs/goals.xml
@@ -7,23 +7,25 @@
   </properties>
 
   <body>
-    <section name="Goals">
-      <table>
-        <tr><th>Goal</th><th>Description</th></tr>
-        <tr>
-          <td>clean</td>
-          <td>
-            This goal is a shortcut to the <code>clean:clean</code> goal
-          </td>
-        </tr>
-        <tr>
-          <td>clean:clean</td>
-          <td>
-            Removes the <a href="properties.html">maven.build.dir</a> and 
-            <a href="properties.html">maven.test.reportsDirectory</a> directories
-          </td>
-        </tr>
-      </table>
-    </section>
- </body>
+    <goals>
+      <goal>
+        <name>clean</name>
+        <description>
+          This goal is a shortcut to the <code>clean:clean</code> goal.
+        </description>
+      </goal>
+      <goal>
+        <name>clean:clean</name>
+        <description>Removes ${maven.build.dir} and ${basedir}/velocity.log.</description>
+      </goal>
+      <goal>
+        <name>clean:classes</name>
+        <description>Removes ${maven.build.dest} and ${maven.test.dest} directories.</description>
+      </goal>
+      <goal>
+        <name>clean:docs</name>
+        <description>Removes the ${maven.gen.docs} and ${maven.docs.dest} directories.</description>
+      </goal>
+    </goals>
+  </body>
 </document>
diff --git a/clean/xdocs/index.xml b/clean/xdocs/index.xml
index 70ea0493..1c2c0b00 100644
--- a/clean/xdocs/index.xml
+++ b/clean/xdocs/index.xml
@@ -9,7 +9,7 @@
   <body>
     <section name="Clean Java Plug-in">
       <p>
-        This plug-in provides functionality for cleaning output directory.
+        This plug-in provides functionality for cleaning output directories.
       </p>
     </section>
  </body>

Goal	Description
clean	- This goal is a shortcut to the `clean:clean` goal -
clean:clean	- Removes the maven.build.dir and - maven.test.reportsDirectory directories -