diff --git a/war/plugin.jelly b/war/plugin.jelly
index cf1a1983..6d505b5f 100644
--- a/war/plugin.jelly
+++ b/war/plugin.jelly
@@ -49,21 +49,24 @@
         </ant:fileset>
       </j:if>
       
-      <j:forEach var="dep" items="${pom.dependencies}">
+      <j:forEach var="lib" items="${pom.artifacts}">
+        <j:set var="dep" value="${lib.dependency}"/>       
+        <j:set var="bundle" value="false"/>
         <j:if test="${dep.getProperty('war.bundle.jar')=='true'}">
           <ant:echo> 
             DEPRECATION WARNING:            
-            Use : war.bundle instead of war.bundle.jar
+            Use : war.bundle instead of war.bundle.jar            
           </ant:echo>
-          <ant:lib dir="${maven.repo.local}/${dep.artifactDirectory}/jars/">
-            <ant:include name="${dep.artifact}"/>
-          </ant:lib>    
+          <j:set var="bundle" value="true"/>
         </j:if>  
-        <j:if test="${dep.getProperty('war.bundle')=='true' and dep.type =='jar' }">
-          <ant:lib dir="${maven.repo.local}/${dep.artifactDirectory}/jars/">
-            <ant:include name="${dep.artifact}"/>
+        <j:if test="${dep.getProperty('war.bundle')=='true' and dep.type =='jar'}">        
+          <j:set var="bundle" value="true"/>
+        </j:if>        
+        <j:if test="${bundle == 'true'}">  
+          <ant:lib dir="${lib.file.parent}">
+            <ant:include name="${lib.file.name}"/>
           </ant:lib>    
-        </j:if>  
+        </j:if>        
       </j:forEach>            
 
       <j:if test="${sourcesPresent == 'true'}">
@@ -131,7 +134,7 @@
       <j:set var="dep" value="${lib.dependency}"/>     
       <j:if test="${dep.getProperty('war.bundle')=='true' and dep.type =='jar' }">
           <ant:copy todir="${webapp.build.lib}"
-             file="${maven.repo.local}/${dep.artifactDirectory}/jars/${dep.artifact}"/>  
+             file="${lib.path}"/>  
       </j:if>  
       <j:if test="${dep.getProperty('war.bundle.jar')=='true'}">
          <ant:echo> 
@@ -139,7 +142,7 @@
             Use : war.bundle instead of war.bundle.jar
           </ant:echo>
         <ant:copy todir="${webapp.build.lib}"
-          file="${maven.repo.local}/${dep.artifactDirectory}/jars/${dep.artifact}"/>
+          file="${lib.path}"/>
       </j:if>  
     </j:forEach>            
 
diff --git a/war/xdocs/changes.xml b/war/xdocs/changes.xml
index 430fe9d8..7b37598f 100644
--- a/war/xdocs/changes.xml
+++ b/war/xdocs/changes.xml
@@ -8,15 +8,18 @@
   <body>
 
     <release version="1.4" date="in CVS">
-      <action dev="dion" type="fix" due-to="Ben Hogan">
-        Allow war file to be updated
-      </action>
       <action dev="michal" type="fix">
-        Iterating artifacts not depedencies            
+        Fixes for MAVEN-518.
+        Artifact processing in the plugin 
+        was slightly changed and now 
+        it supports jar overriding mechanism
       </action>
       <action dev="michal" type="add">
         Added deploy, deploy-snapshot and install-snapshot goals
       </action>
+      <action dev="dion" type="fix" due-to="Ben Hogan">
+        Allow war file to be updated
+      </action>      
     </release>
     
     <release version="1.3" date="2002-04-08">
diff --git a/war/xdocs/goals.xml b/war/xdocs/goals.xml
index 07abad56..eeaab2b7 100644
--- a/war/xdocs/goals.xml
+++ b/war/xdocs/goals.xml
@@ -19,6 +19,18 @@
         <name>war:install</name>
         <description>Install the war in the local repository</description>
       </goal>
+      <goal>
+        <name>war:install-snapshot</name>
+        <description>Install the snapshot version of  the war in the local repository</description>
+      </goal>      
+      <goal>
+        <name>war:deploy</name>
+        <description>Deploy the war to the remote repository(ies)</description>
+      </goal>
+      <goal>
+        <name>war:deploy-snapshot</name>
+        <description>Deploy the snapshot version of the war to the remote repository(ies)</description>
+      </goal>
       <goal>
         <name>war:war</name>
         <description>Build a war file</description>
