diff --git a/war/plugin.jelly b/war/plugin.jelly
index db7aa69d..7c253406 100644
--- a/war/plugin.jelly
+++ b/war/plugin.jelly
@@ -145,15 +145,14 @@
     <j:forEach var="lib" items="${pom.artifacts}">
       <j:set var="dep" value="${lib.dependency}"/>     
       <j:if test="${dep.getProperty('war.bundle')=='true'}">
-          
-         <j:if test="${dep.type =='jar'}"> 
-           <ant:copy todir="${webapp.build.lib}" file="${lib.path}"/>  
-         </j:if> 
-         
-         <j:if test="${dep.type =='tld'}"> 
-           <ant:copy todir="${webapp.build.tlds}" file="${lib.path}"/>  
-         </j:if> 
-          
+         <j:choose>
+           <j:when test="${dep.type =='jar' or dep.type =='ejb' or dep.type == 'ejb-client'}"> 
+             <ant:copy todir="${webapp.build.lib}" file="${lib.path}"/>  
+           </j:when> 
+           <j:when test="${dep.type =='tld'}"> 
+             <ant:copy todir="${webapp.build.tlds}" file="${lib.path}"/>  
+           </j:when> 
+         </j:choose>           
       </j:if>  
       <!-- TO BE REMOVED -->
       <j:if test="${dep.getProperty('war.bundle.jar')=='true'}">
diff --git a/war/xdocs/changes.xml b/war/xdocs/changes.xml
index 6cd336a4..205ed9d9 100644
--- a/war/xdocs/changes.xml
+++ b/war/xdocs/changes.xml
@@ -24,6 +24,9 @@
     <author email="vmassol@apache.org">Vincent Massol</author>
   </properties>
   <body>
+    <release version="1.6.2-SNAPSHOT" date="In SVN">
+      <action dev="aheritier" type="update" issue="MPWAR-50">Add support for EJB client code.</action>
+    </release>
     <release version="1.6.1" date="2004-10-23">
       <action dev="felipeal" type="fix" issue="MPWAR-33">Removed attribute
         <code>update=true</code>from