diff --git a/clean/clean/plugin.jelly b/clean/clean/plugin.jelly
index 76a9c54e..276ef3fa 100644
--- a/clean/clean/plugin.jelly
+++ b/clean/clean/plugin.jelly
@@ -12,5 +12,17 @@
     <ant:delete dir="${maven.build.dir}"/>
     <ant:delete file="${basedir}/velocity.log" quiet="true" failonerror="false"/>
   </goal>
+  
+  <clean name="clean:classes"
+         description="Remove all build and test classes">
+    <ant:delete dir="maven.build.dest"/>
+    <ant:delete dir="maven.test.dest"/>
+  </clean>
+  
+  <clean name="clean:docs"
+         description="Remove all docs and generated xdocs">
+    <ant:delete dir="maven.gen.docs"/>
+    <ant:delete dir="maven.docs.dest"/>
+  </clean>
 
 </project>
diff --git a/clean/clean/xdocs/changes.xml b/clean/clean/xdocs/changes.xml
index 8152124f..85f499d8 100644
--- a/clean/clean/xdocs/changes.xml
+++ b/clean/clean/xdocs/changes.xml
@@ -8,6 +8,9 @@
   <body>
     
     <release version="1.0" date="in cvs">
+      <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.
       </action>
diff --git a/clean/plugin.jelly b/clean/plugin.jelly
index 76a9c54e..276ef3fa 100644
--- a/clean/plugin.jelly
+++ b/clean/plugin.jelly
@@ -12,5 +12,17 @@
     <ant:delete dir="${maven.build.dir}"/>
     <ant:delete file="${basedir}/velocity.log" quiet="true" failonerror="false"/>
   </goal>
+  
+  <clean name="clean:classes"
+         description="Remove all build and test classes">
+    <ant:delete dir="maven.build.dest"/>
+    <ant:delete dir="maven.test.dest"/>
+  </clean>
+  
+  <clean name="clean:docs"
+         description="Remove all docs and generated xdocs">
+    <ant:delete dir="maven.gen.docs"/>
+    <ant:delete dir="maven.docs.dest"/>
+  </clean>
 
 </project>
diff --git a/clean/xdocs/changes.xml b/clean/xdocs/changes.xml
index 8152124f..85f499d8 100644
--- a/clean/xdocs/changes.xml
+++ b/clean/xdocs/changes.xml
@@ -8,6 +8,9 @@
   <body>
     
     <release version="1.0" date="in cvs">
+      <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.
       </action>
