diff --git a/javadoc/plugin.jelly b/javadoc/plugin.jelly
index c4c51ac9..6c435d93 100644
--- a/javadoc/plugin.jelly
+++ b/javadoc/plugin.jelly
@@ -5,7 +5,9 @@
   xmlns:define="jelly:define"
   xmlns:doc="doc"
   xmlns:j="jelly:core" 
-  xmlns:util="jelly:util">
+  xmlns:util="jelly:util"
+  xmlns:artifact="artifact"
+  >
 
   <goal name="maven-javadoc-plugin:register">
     <j:if test="${sourcesPresent}">
@@ -168,5 +170,78 @@
     </j:if>
 
   </goal>
+  
+  
+  <!--==================================================================-->
+  <!-- Install the war in the local repository                          -->
+  <!--==================================================================-->      
+  <goal name="javadoc:jar" prereqs="javadoc">
+    <j:set var="maven.javadoc.final.name" 
+           value="${maven.war.build.dir}/${maven.final.name}_javadoc.jar" />   
+    <ant:jar 
+         destfile="${maven.javadoc.final.name}"
+         basedir="${maven.javadoc.destdir}"         
+         update="true">
+    </ant:jar>
+  </goal>
+  
+  <!--==================================================================-->
+  <!-- Install the war in the local repository                          -->
+  <!--==================================================================-->    
+  <goal name="javadoc:install"
+        prereqs="javadoc:jar"
+        description="Install the jar containing javadoc in the local repository">
+     
+     <artifact:install
+        artifact="${maven.javadoc.final.name}"
+        type="javadoc"
+        project="${pom}"/> 
+  
+  </goal>
+  
+  <!--==================================================================-->
+  <!-- Install the snapshot version of the war in the local repository  -->
+  <!--==================================================================-->      
+  <goal name="javadoc:install-snapshot"
+        prereqs="javadoc:jar" 
+        description="Install the snapshot version of the jar containing javadoc in the local repository">
+        
+      <artifact:install-snapshot
+        artifact="${maven.javadoc.final.name}"
+        type="javadoc"
+        project="${pom}"/> 
+        
+  </goal>
+
+  <!--==================================================================-->
+  <!-- Deploys the javadoc to the remote repository                         -->
+  <!--==================================================================-->      
+  <goal name="javadoc:deploy" 
+        prereqs="javadoc:jar" 
+        description="Deploys the jar containing javadoc to the remote repository">
+
+     <artifact:deploy
+        artifact="${maven.javadoc.final.name}"
+        type="javadoc"
+        project="${pom}"/>   
+        
+  </goal>      
+        
+  <!--==================================================================-->
+  <!-- Deploys the snapshot of the javadoc to the remote repository         -->
+  <!--==================================================================-->      
+  <goal name="javadoc:deploy-snapshot" 
+        prereqs="javadoc:jar"
+        description="Deploys the snapshot version of jar containing javadoc to remote repository">  
+
+     <artifact:deploy-snapshot
+        artifact="${maven.javadoc.final.name}"
+        type="javadoc"
+        project="${pom}"/>    
+        
+  </goal>
+  
+  
+  
 
 </project>
diff --git a/javadoc/project.xml b/javadoc/project.xml
index 16338b97..1b90c6b5 100644
--- a/javadoc/project.xml
+++ b/javadoc/project.xml
@@ -53,6 +53,16 @@
         <role>Release Manager</role>
       </roles>
     </developer>
+    <developer>
+      <name>Michal Maczka</name>
+      <id>michal</id>
+      <email>michal.maczka@dimatics.com</email>
+      <organization>Dimatics</organization>
+      <roles>
+        <role>Jelly Developer</role>
+      </roles>
+    </developer>
+    
   </developers>
   <dependencies>
     <dependency>
diff --git a/javadoc/xdocs/changes.xml b/javadoc/xdocs/changes.xml
index a931b60a..deb75485 100644
--- a/javadoc/xdocs/changes.xml
+++ b/javadoc/xdocs/changes.xml
@@ -8,6 +8,9 @@
 
   <body>
     <release version="1.3" date="in CVS">
+      <action dev="michal" type="add">
+        Added install, install-snapshot, deploy and deploy-snapshot goals
+      </action>
       <action dev="dion" type="fix">
         Now respects pom.build.sourceModifications
       </action>
diff --git a/javadoc/xdocs/goals.xml b/javadoc/xdocs/goals.xml
index 079962fa..9c71a46b 100644
--- a/javadoc/xdocs/goals.xml
+++ b/javadoc/xdocs/goals.xml
@@ -4,32 +4,41 @@
   <properties>
     <title>JavaDoc Plugin Goals</title>
     <author email="dion@apache.org">dIon Gillard</author>
+    <author email="michal.maczka@dimatics.com">Michal Maczka</author>
   </properties>
 
   <body>
-    <section name="Goals">
-      <table>
-      	<tr><th>Goal</th><th>Description</th></tr>
-      	
-		<a name="javadoc" />
-      	<tr>
-      	  <td>javadoc</td>
-      	  <td>
+    <goals>
+      <goal>
+        <name>javadoc</name>
+      	<description>
       	    The default goal. This goal simply executes the 
       	    <a href="#javadoc:generate">javadoc:generate</a> goal
-      	  </td>
-      	</tr>
-      	
-      	<a name="javadoc:generate" />
-      	<tr>
-          <td>javadoc:generate</td>
-          <td>
+      	</description>
+      </goal>
+      <goal>
+        <name>javadoc:generate</name>
+      	<description>
             Generates documentation using Java's built-in 
-            <a href="http://java.sun.com/j2se/javadoc/">Javadoc</a> tool
-          </td>
-      	</tr>
-      	
-      </table>
-    </section>
+            <a href="http://java.sun.com/j2se/javadoc/">Javadoc</a> tool      	
+        </description>            
+      </goal>
+      <goal>
+        <name>javadoc:install</name>
+        <description>Installs the jar containing javadoc documentation in the local repository</description>
+      </goal>
+      <goal>
+        <name>javadoc:install-snapshot</name>
+        <description>Installs the jar containing javadoc documentation of the snapshot version in the local repository</description>
+      </goal>      
+      <goal>
+        <name>javadoc:deploy</name>
+        <description>Deploys the jar containing javadoc documentation the remote repository(ies)</description>
+      </goal>
+      <goal>
+        <name>javadoc:deploy-snapshot</name>
+        <description>Deploys the jar containing javadoc documentation of the snapshot version to the remote repository(ies)</description>
+      </goal>      
+    </goals>
   </body>
 </document>

Goal	Description
javadoc	+ + + javadoc + The default goal. This goal simply executes the javadoc:generate goal -
javadoc:generate	+ + + + javadoc:generate + Generates documentation using Java's built-in - Javadoc tool -