diff --git a/plugin/plugin.jelly b/plugin/plugin.jelly
index 95ddcdc8..b8573e55 100644
--- a/plugin/plugin.jelly
+++ b/plugin/plugin.jelly
@@ -18,16 +18,20 @@
 
   </goal>
 
-  <goal name="plugin:install" prereqs="plugin"
+  <goal name="plugin:install" prereqs="plugin,plugin:uninstall"
     description="Install the plugin jar, prepare Maven to expand it locally and clear caches">
 
     <copy file="${maven.build.dir}/${maven.final.name}.jar"
       todir="${maven.home}/plugins"/>
 
+  </goal>
+
+  <goal name="plugin:uninstall" 
+    description="Uninstall all versions of the plugin">
+    
     <delete verbose="false">
       <fileset dir="${maven.home}/plugins">
         <include name="${pom.artifactId}-*.jar" />
-        <exclude name="${maven.final.name}.jar" />
       </fileset>
     </delete>
 
@@ -36,10 +40,9 @@
         <include name="*.cache"/>
         <include name="**/.processed" />
         <include name="${pom.artifactId}-*/**" />
-        <exclude name="${maven.final.name}.jar" />
       </fileset>
     </delete>
-
+    
   </goal>
 
   <goal name="plugin:deploy" prereqs="plugin"
@@ -171,7 +174,7 @@
   </goal>
   
   <!-- download a plugin from a remote repo -->
-  <goal name="plugin:download">
+  <goal name="plugin:download" description="download a plugin from a remote repo">
     <maven:param-check value="${artifactId}" fail="true" message="'artifactId' must be specified"/>
     <maven:param-check value="${groupId}" fail="true" message="'groupId' must be specified"/>
     <maven:param-check value="${version}" fail="true" message="'version' must be specified"/>
@@ -211,6 +214,7 @@
     </j:if>
     <j:if test="${downloaded}">
       <echo>Plugin downloaded, removing other versions</echo>
+
       <delete verbose="false">
         <fileset dir="${maven.home}/plugins">
           <include name="${artifactId}-*.jar" />