diff --git a/ejb/plugin.jelly b/ejb/plugin.jelly
index 1fc4e253..f348aee9 100644
--- a/ejb/plugin.jelly
+++ b/ejb/plugin.jelly
@@ -3,7 +3,8 @@
 <project xmlns:j="jelly:core"
          xmlns:ant="jelly:ant"
          xmlns:license="license" 
-         xmlns:util="jelly:util">
+         xmlns:util="jelly:util"
+         xmlns:artifact="artifact">
 
   <!--==================================================================-->
   <!-- Default goal : Builds a ejb file                                 -->
@@ -16,6 +17,8 @@
   <goal name="ejb:init" 
     description="Initialize filesystem and other resources for an ejb build">
 
+   <j:set var="maven.ejb.final.name" 
+      value="${maven.build.dir}/${maven.final.name}.jar"/>
 
     <j:if test="${sourcesPresent == 'true'}">
       <attainGoal name="test:test"/>
@@ -41,7 +44,7 @@
 
     <!-- jar task used for now due to problems with ejb jar not including 
          files other than class files -->
-    <ant:jar jarfile="${maven.build.dir}/${maven.final.name}.jar">
+    <ant:jar jarfile="${maven.ejb.final.name}">
       
       <!-- include marked dependencies -->
       <j:forEach var="lib" items="${pom.artifacts}">
@@ -102,20 +105,63 @@
     </ant:jar>
 
   </goal>
-
+     
   <!--==================================================================-->
   <!-- Install the ejb in the local repository                          -->
-  <!--==================================================================-->
+  <!--==================================================================-->    
   <goal name="ejb:install"
         prereqs="ejb:ejb"
         description="Install the ejb in the local repository">
-
-    <ant:property name="maven.ejb.install.dir"
-      value="${maven.repo.local}/${pom.artifactDirectory}/ejbs"/>
-    <ant:mkdir dir="${maven.ejb.install.dir}"/>
-    <ant:copy file="${maven.build.dir}/${maven.final.name}.jar"
-      tofile="${maven.ejb.install.dir}/${maven.final.name}.jar"/>
-
+     
+     <artifact:install
+        artifact="${maven.ejb.final.name}"
+        type="ejb"
+        project="${pom}"/> 
+  
+  </goal>
+  
+  <!--==================================================================-->
+  <!-- Install the snapshot version of the ejb in the local repository  -->
+  <!--==================================================================-->      
+  <goal name="ejb:install-snapshot"
+        prereqs="ejb:ejb" 
+        description="Install the snapshot version of the ejb in the local repository">
+        
+      <artifact:install-snapshot
+        artifact="${maven.ejb.final.name}"
+        type="ejb"
+        project="${pom}"/> 
+        
   </goal>
 
+  <!--==================================================================-->
+  <!-- Deploys the ejb to the remote repository                         -->
+  <!--==================================================================-->      
+  <goal name="ejb:deploy" 
+        prereqs="ejb:ejb" 
+        description="Deploys the ejb to the remote repository">
+
+     <artifact:deploy
+        artifact="${maven.ejb.final.name}"
+        type="ejb"
+        project="${pom}"/>   
+        
+  </goal>      
+        
+  <!--==================================================================-->
+  <!-- Deploys the snapshot of the ejb to the remote repository         -->
+  <!--==================================================================-->      
+  <goal name="ejb:deploy-snapshot" 
+        prereqs="ejb:ejb"
+        description="Deploys the snapshot version of the ejb to remote repository">  
+
+     <artifact:deploy-snapshot
+        artifact="${maven.ejb.final.name}"
+        type="ejb"
+        project="${pom}"/>    
+        
+  </goal>
+  
+  
+
 </project>
diff --git a/ejb/project.xml b/ejb/project.xml
index d43bc65f..aaad83b4 100644
--- a/ejb/project.xml
+++ b/ejb/project.xml
@@ -34,6 +34,15 @@
         <role>Java Developer</role>
       </roles>
     </developer>
+    <developer>
+      <name>Michal Maczka</name>
+      <id>michal</id>
+      <email>michal.maczka@dimatics.com</email>
+      <roles>
+        <role>Java Developer</role>
+      </roles>
+    </developer>
+    
   </developers>
   <dependencies/>
 </project>
diff --git a/ejb/xdocs/changes.xml b/ejb/xdocs/changes.xml
index ecbe253d..08502ae1 100644
--- a/ejb/xdocs/changes.xml
+++ b/ejb/xdocs/changes.xml
@@ -6,6 +6,9 @@
   </properties>
   <body>
     <release version="1.1" date="in CVS">
+      <action dev="michal" type="add">
+        Added deploy, deploy-snapshot and install-snapshot goals
+      </action>
       <action dev="michal" type="fix">
         Fixes for MAVEN-518.
         Artifact processing in the plugin 
diff --git a/ejb/xdocs/goals.xml b/ejb/xdocs/goals.xml
index f7e85123..6f9f4b58 100644
--- a/ejb/xdocs/goals.xml
+++ b/ejb/xdocs/goals.xml
@@ -1,35 +1,46 @@
 <?xml version="1.0"?>
 <document>
-
   <properties>
     <title>Maven EJB Plug-in Goals</title>
+    <author email="michal.maczka@dimatics.com">Michal Maczka</author>
     <author email="nathan.coast@blueyonder.co.uk">Nathan Coast</author>
   </properties>
-
   <body>
-    <section name="Goals">
-      <table>
-        <tr><th>Goal</th><th>Description</th></tr>
-        <tr>
-          <td>ejb</td>
-          <td>
-            Default goal - see ejb:ejb
-          </td>
-        </tr>
-        <tr>
-          <td>ejb:ejb</td>
-          <td>
-            constructs the ejb-jar file from the compiled sources 
-            and resources.
-          </td>
-        </tr>
-        <tr>
-          <td>ejb:install</td>
-          <td>
-            Installs the generated ejb-jar file into the local repository
-          </td>
-        </tr>
-      </table>
-    </section>
- </body>
+    <goals>
+      <goal>
+        <name>ejb</name>
+        <description>
+          Build a ejb file. 
+          This goal simply executes the <a href="ejb:ejb">ejb:ejb</a> goal
+        </description>
+      </goal>
+      <goal>
+        <name>ejb:init</name>
+        <description>Initialize the file system and attain any necessary goals</description>
+      </goal>
+      <goal>
+        <name>ejb:ejb</name>
+        <description>
+          Constructs the ejb-jar file from the compiled sources 
+          and resources.
+        </description>
+      </goal>      
+      <goal>
+        <name>ejb:install</name>
+        <description>Installs the generated ejb-jar file into the local repository</description>
+      </goal>
+      <goal>
+        <name>ejb:install-snapshot</name>
+        <description>Install the snapshot version of the ejb into the local repository</description>
+      </goal>      
+      <goal>
+        <name>ejb:deploy</name>
+        <description>Deploy the ejb to the remote repository(ies)</description>
+      </goal>
+      <goal>
+        <name>ejb:deploy-snapshot</name>
+        <description>Deploy the snapshot version of the ejb to the remote repository(ies)</description>
+      </goal>  
+    </goals>      
+  </body>
 </document>