diff --git a/ejb/plugin.jelly b/ejb/plugin.jelly
index f348aee9..ca10c1cc 100644
--- a/ejb/plugin.jelly
+++ b/ejb/plugin.jelly
@@ -106,6 +106,17 @@
 
   </goal>
      
+  <!--==================================================================-->
+  <!-- Builds an ejb client jar file                                    -->
+  <!--==================================================================-->
+  <goal name="ejb:ejb-client" prereqs="ejb:ejb" description="Build a client ejb file">
+    <ant:jar jarfile="${maven.build.dir}/${maven.final.name}-client.jar"
+             basedir="${maven.build.dest}"
+             excludes="${maven.ejb.client.base.excludes},${maven.ejb.client.excludes}"
+             >
+    </ant:jar>
+  </goal>
+  
   <!--==================================================================-->
   <!-- Install the ejb in the local repository                          -->
   <!--==================================================================-->    
diff --git a/ejb/plugin.properties b/ejb/plugin.properties
index 3f311e80..677662df 100644
--- a/ejb/plugin.properties
+++ b/ejb/plugin.properties
@@ -8,3 +8,7 @@ maven.ejb.src=${maven.src.dir}/ejb
 # Location of ejb xml configs - not used atm due to using jar task not ejbjar
 maven.ejb.descriptordir=${maven.ejb.src}/META-INF
 maven.ejb.manifest=${maven.ejb.descriptordir}/MANIFEST.MF
+# Exclude from the client jar those things that should only exist on the EJB server.
+# This list is probably incomplete...
+# Users' projects can add to the list by setting maven.ejb.client.excludes.
+maven.ejb.client.base.excludes=**/*Bean.class,**/*CMP.class,**/*Session.class
diff --git a/ejb/xdocs/properties.xml b/ejb/xdocs/properties.xml
index 4f64dc6a..be86fa87 100644
--- a/ejb/xdocs/properties.xml
+++ b/ejb/xdocs/properties.xml
@@ -20,6 +20,26 @@
             src/ejb
           </td>
         </tr>
+        <tr>
+          <td>maven.ejb.client.base.excludes</td>
+          <td>Yes</td>
+          <td>
+            Classes excluded by default from a client ejb jar
+          </td>
+          <td>
+            **/*Bean.class,**/*CMP.class,**/*Session.class
+          </td>
+        </tr>
+        <tr>
+          <td>maven.ejb.client.excludes</td>
+          <td>Yes</td>
+          <td>
+            Classes excluded from a client ejb jar
+          </td>
+          <td>
+            None
+          </td>
+        </tr>
         <tr>
           <td>maven.ejb.manifest</td>
           <td>Yes</td>