diff --git a/ejb/plugin.jelly b/ejb/plugin.jelly
index 3a5bb0b3..d78e5b8e 100644
--- a/ejb/plugin.jelly
+++ b/ejb/plugin.jelly
@@ -108,7 +108,10 @@
         <ant:attribute name="Built-By" value="${user.name}"/>
         <ant:attribute name="Created-By" value="Apache Jakarta Maven"/>
         <ant:attribute name="Package" value="${pom.package}"/>
-        <ant:attribute name="Class-Path" value="${maven.ejb.classpath}"/>
+        <j:set var="classPath" value="${maven.ejb.classpath}"/>
+        <j:if test="${!empty(classPath)}">
+          <ant:attribute name="Class-Path" value="${maven.ejb.classpath}"/>
+        </j:if>
         <ant:section name="${pom.package}">
           <ant:attribute name="Specification-Title" value="${pom.artifactId}"/>
           <ant:attribute name="Specification-Vendor" value="${pom.organization.name}"/>
diff --git a/ejb/xdocs/changes.xml b/ejb/xdocs/changes.xml
index 9ed88372..03c76203 100644
--- a/ejb/xdocs/changes.xml
+++ b/ejb/xdocs/changes.xml
@@ -24,6 +24,12 @@
   </properties>
   <body>
 
+    <release version="1.4" date="in CVS">
+      <action dev="dion" type="fix">
+        Don't generate a Class-Path manfiest entry if there are no jars with ejb.manifest.classpath set to true
+      </action>
+    </release>
+
     <release version="1.3" date="2004-01-29">
       <action dev="dion" type="fix">
         Only include maven.ejb.src if it exists
