diff --git a/jar/plugin.jelly b/jar/plugin.jelly
index ce500b8c..7b1d2f7a 100644
--- a/jar/plugin.jelly
+++ b/jar/plugin.jelly
@@ -103,7 +103,9 @@
           <j:set var="extensionList" value=""/>
           <j:forEach var="artifact" items="${pom.artifacts}">
             <j:set var="dep" value="${artifact.dependency}"/>
-            <j:set var="extensionList" value="${extensionList} ${dep.artifactId}"/>
+            <j:if test="${dep.type == 'jar' || empty(dep.type)}">
+              <j:set var="extensionList" value="${extensionList} ${dep.artifactId}"/>
+            </j:if>
           </j:forEach>
 
 		  <j:if test="${extensionList.length() != 0}">        
@@ -113,9 +115,19 @@
 
           <j:forEach var="artifact" items="${pom.artifacts}">
             <j:set var="dep" value="${artifact.dependency}"/>
-	        <ant:attribute name="${dep.artifactId}-Extension-Name" value="${dep.artifactId}"/>
-            <ant:attribute name="${dep.artifactId}-Implementation-Version" value="${dep.version}"/>
-            <ant:attribute name="${dep.artifactId}-Implementation-URL" value="http://www.ibiblio.org/maven${artifact.urlPath}"/>
+            <j:if test="${dep.type == 'jar' || empty(dep.type)}">
+              <ant:attribute name="${dep.artifactId}-Extension-Name" value="${dep.artifactId}"/>
+              <ant:attribute name="${dep.artifactId}-Implementation-Version" value="${dep.version}"/>
+              
+              <j:choose>
+                <j:when test="${empty(dep.url) || dep.url.toString().trim().length() == 0}">
+                  <ant:attribute name="${dep.artifactId}-Implementation-URL" value="http://www.ibiblio.org/maven${artifact.urlPath}"/>
+                </j:when>
+                <j:otherwise>
+                  <ant:attribute name="${dep.artifactId}-Implementation-URL" value="${dep.url}"/>
+                </j:otherwise>
+              </j:choose>
+            </j:if>
           </j:forEach>        
         </j:if>
 
diff --git a/jar/xdocs/changes.xml b/jar/xdocs/changes.xml
index 5d872516..63eed261 100644
--- a/jar/xdocs/changes.xml
+++ b/jar/xdocs/changes.xml
@@ -26,6 +26,7 @@
   </properties>
   <body>
     <release version="1.5-SNAPSHOT" date="in CVS">
+      <action dev="brett" type="fix" issue="MPJAR-22" due-to="Corey Jewett">improve manifest generation</action>
       <action dev="brett" type="fix" issue="MPJAR-17">revert maven.final.name to previuous value after executing jar:snapshot related goals.</action>
     </release>
     <release version="1.4" date="2004-02-27">
