diff --git a/ejb/plugin.jelly b/ejb/plugin.jelly
index af2acd50..1fc4e253 100644
--- a/ejb/plugin.jelly
+++ b/ejb/plugin.jelly
@@ -44,13 +44,30 @@
     <ant:jar jarfile="${maven.build.dir}/${maven.final.name}.jar">
       
       <!-- include marked dependencies -->
-      <j:forEach var="dep" items="${pom.dependencies}">
-        <j:if test="${dep.getProperty('ejb.bundle.jar')=='true'}">
-          <!-- FIXME: This doesn't allow jar overrides to work -->
-          <ant:fileset dir="${maven.repo.local}/${dep.artifactDirectory}/jars/">
-            <ant:include name="${dep.artifact}"/>
+      <j:forEach var="lib" items="${pom.artifacts}">
+        <j:set var="dep" value="${lib.dependency}"/>     
+
+        <!-- Just include jars-->
+        <!-- Probably we should also include uberjars -->
+        <j:if test="${dep.getProperty('ejb.bundle')=='true' and dep.type=='jar'}">          
+          <ant:echo>Bundling: ${dep.type} - ${dep.id}</ant:echo>                                             
+          <ant:fileset dir="${lib.file.parent}">
+            <ant:include name="${lib.file.name}"/>
           </ant:fileset>
-        </j:if>
+        </j:if>   
+        
+        <!-- TO BE REMOVED -->
+        <j:if test="${dep.getProperty('ejb.bundle.jar')=='true'}">
+          <ant:echo> 
+           <ant:echo>Bundling: ${dep.type} - ${dep.id}</ant:echo>        
+            DEPRECATION WARNING:            
+            Use : ejb.bundle instead of ejb.bundle.jar
+          </ant:echo>
+          <ant:fileset dir="${lib.file.parent}">
+            <ant:include name="${lib.file.name}"/>
+          </ant:fileset>
+        </j:if>  
+        <!-- END OF TO BE REMOVED -->        
       </j:forEach>
  
 
diff --git a/ejb/project.xml b/ejb/project.xml
index 8fd64313..d43bc65f 100644
--- a/ejb/project.xml
+++ b/ejb/project.xml
@@ -5,7 +5,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-ejb-plugin</id>
   <name>Maven EJB Plugin</name>
-  <currentVersion>1.0</currentVersion>
+  <currentVersion>1.1-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 ae52be5f..ecbe253d 100644
--- a/ejb/xdocs/changes.xml
+++ b/ejb/xdocs/changes.xml
@@ -5,6 +5,17 @@
     <author email="nathan.coast@blueyonder.co.uk">Nathan Coast</author>
   </properties>
   <body>
+    <release version="1.1" date="in CVS">
+      <action dev="michal" type="fix">
+        Fixes for MAVEN-518.
+        Artifact processing in the plugin 
+        was slightly changed and now it supports jar overriding mechanism           
+      </action>
+      <action dev="michal" type="fix">
+         property ejb.bundle.jar was renamed to ejb.bundle 
+         (old property is still supported, but deprecated)
+      </action>
+    </release>  
     <release version="1.0" date="2002-08-04">
       <action dev="ncoast" type="add">
         Initial plugin created
diff --git a/ejb/xdocs/properties.xml b/ejb/xdocs/properties.xml
index 3f049dff..4f64dc6a 100644
--- a/ejb/xdocs/properties.xml
+++ b/ejb/xdocs/properties.xml
@@ -64,7 +64,7 @@
       <id>jarid</id>
       <version>jarversion</version>
       <properties>
-        <ejb.bundle.jar>true</ejb.bundle.jar>
+        <ejb.bundle>true</ejb.bundle>
       </properties>
     </dependency>
   ]]></source>
