diff --git a/ejb/plugin.jelly b/ejb/plugin.jelly
index 88d0813b..6d37d423 100644
--- a/ejb/plugin.jelly
+++ b/ejb/plugin.jelly
@@ -148,6 +148,20 @@
     </ant:jar>
   </goal>
   
+  <!--==================================================================-->
+  <!-- Install the ejb client in the local repository                   -->
+  <!--==================================================================-->    
+  <goal name="ejb:install-client"
+        prereqs="ejb:ejb-client"
+        description="Install the ejb client in the local repository">
+     
+     <artifact:install
+        artifact="${maven.build.dir}/${maven.final.name}-client.jar"
+        type="jar"
+        project="${pom}"/> 
+  
+  </goal>
+  
   <!--==================================================================-->
   <!-- Install the ejb in the local repository                          -->
   <!--==================================================================-->    
@@ -178,7 +192,7 @@
 
   <!--==================================================================-->
   <!-- Deploys the ejb to the remote repository                         -->
-  <!--==================================================================-->      
+  <!--==================================================================-->
   <goal name="ejb:deploy" 
         prereqs="ejb:ejb" 
         description="Deploys the ejb to the remote repository">
@@ -188,7 +202,7 @@
         type="ejb"
         project="${pom}"/>   
         
-  </goal>      
+  </goal>
         
   <!--==================================================================-->
   <!-- Deploys the snapshot of the ejb to the remote repository         -->
@@ -204,6 +218,17 @@
         
   </goal>
   
-  
+  <!--==================================================================-->
+  <!-- Deploys the ejb to the remote repository                         -->
+  <!--==================================================================-->
+  <goal name="ejb:deploy-client" 
+        prereqs="ejb:ejb-client" 
+        description="Deploys the ejb client to the remote repository">
+
+     <artifact:deploy
+        artifact="${maven.build.dir}/${maven.final.name}-client.jar"
+        type="ejb"
+        project="${pom}"/>   
+  </goal>
 
 </project>
diff --git a/ejb/project.xml b/ejb/project.xml
index 233a6479..639c5f0b 100644
--- a/ejb/project.xml
+++ b/ejb/project.xml
@@ -23,7 +23,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-ejb-plugin</id>
   <name>Maven EJB Plugin</name>
-  <currentVersion>1.4</currentVersion>
+  <currentVersion>1.5-SNAPSHOT</currentVersion>
   <description>EJB Plugin for Maven</description>
   <shortDescription>EJB Plugin for Maven</shortDescription>
   <url>http://maven.apache.org/reference/plugins/ejb/</url>
diff --git a/ejb/xdocs/changes.xml b/ejb/xdocs/changes.xml
index 5e39693f..b632c5de 100644
--- a/ejb/xdocs/changes.xml
+++ b/ejb/xdocs/changes.xml
@@ -24,6 +24,9 @@
     <author email="nathan.coast@blueyonder.co.uk">Nathan Coast</author>
   </properties>
   <body>
+    <release version="1.5" date="In CVS">
+      <action dev="evenisse" type="add">Add ejb:install-client and ejb:deploy-client goals.</action>
+    </release>
     <release version="1.4" date="2004-05-15">
       <action dev="dion" type="fix">Don't generate a Class-Path manfiest entry if there are no jars with ejb.manifest.classpath set to true</action>
     </release>
diff --git a/ejb/xdocs/goals.xml b/ejb/xdocs/goals.xml
index c19fe7ef..6123c3df 100644
--- a/ejb/xdocs/goals.xml
+++ b/ejb/xdocs/goals.xml
@@ -51,6 +51,10 @@
         <name>ejb:install-snapshot</name>
         <description>Install the snapshot version of the ejb into the local repository</description>
       </goal>      
+      <goal>
+        <name>ejb:install-client</name>
+        <description>Installs the generated ejb-jar client file into the local repository</description>
+      </goal>
       <goal>
         <name>ejb:deploy</name>
         <description>Deploy the ejb to the remote repository(ies)</description>
@@ -59,6 +63,10 @@
         <name>ejb:deploy-snapshot</name>
         <description>Deploy the snapshot version of the ejb to the remote repository(ies)</description>
       </goal>  
+      <goal>
+        <name>ejb:deploy-client</name>
+        <description>Deploys the generated ejb-jar client file into the remote repository(ies)</description>
+      </goal>
     </goals>      
   </body>
 </document>