diff --git a/jar/plugin.jelly b/jar/plugin.jelly
index 0eb07147..3cf5db01 100644
--- a/jar/plugin.jelly
+++ b/jar/plugin.jelly
@@ -45,6 +45,18 @@
         <ant:attribute name="Created-By" value="Apache Jakarta Maven"/>
         <ant:attribute name="Package" value="${pom.package}"/>
         <ant:attribute name="Build-Jdk" value="${java.version}"/>
+
+        <j:set var="jarClasspath" value="${maven.jar.manifest.classpath.add}"/>
+        <j:if test="${jarClasspath}">
+            <j:forEach var="dep" items="${pom.dependencies}">
+                <j:if test="${dep.getProperty('jar.manifest.classpath')=='true'}">
+                    <j:set var="maven.jar.classpath" value="${maven.jar.classpath} ${dep.artifact}" /> 
+                </j:if>
+            </j:forEach>
+            <j:if test="${maven.jar.classpath.length() != 0}">
+                <ant:attribute name="Class-Path" value="${maven.jar.classpath}"/>
+            </j:if>
+        </j:if>
         <!-- added supplementary entries -->
         <ant:attribute name="Extension-Name" value="${pom.artifactId}"/>
         <ant:attribute name="Specification-Title" value="${pom.shortDescription}"/>
diff --git a/jar/xdocs/changes.xml b/jar/xdocs/changes.xml
index 20ef7c00..273f4232 100644
--- a/jar/xdocs/changes.xml
+++ b/jar/xdocs/changes.xml
@@ -8,6 +8,12 @@
 
   <body>
 
+    <release version="1.4" date="In cvs">
+      <action dev="neilc" type="update">
+        Added manifest Class-Path, specified by setting property
+        jar.manifest.classpath on dependency artifacts in project.xml.
+      </action>
+    </release>
     <release version="1.2" date="In cvs">
       <action dev="evenisse" type="fix">
         Fixed maven.jar.manifest.extensions.add use.
diff --git a/jar/xdocs/properties.xml b/jar/xdocs/properties.xml
index 15b2ce42..bbb751f1 100644
--- a/jar/xdocs/properties.xml
+++ b/jar/xdocs/properties.xml
@@ -54,6 +54,15 @@
             property will override Maven's defaults.
           </td>
         </tr>
+        <tr>
+          <td>maven.jar.manifest.classpath.add</td>
+          <td>Yes</td>
+          <td>
+            Tells maven to add classpath information the the jar manifest.
+            This can cause some applications to break, so it has been disabled by default.
+            Set to 'true' to enable classpath information.
+          </td>
+        </tr>
         <tr>
           <td>maven.jar.manifest.extensions.add</td>
           <td>Yes</td>
