diff --git a/docs/manual/OptionalTasks/ejb.html b/docs/manual/OptionalTasks/ejb.html
index 1db596d83..60f5567ab 100644
--- a/docs/manual/OptionalTasks/ejb.html
+++ b/docs/manual/OptionalTasks/ejb.html
@@ -715,7 +715,8 @@ the value <code>none</code>.</p>
                      namespace. Note that this attribute is only used if the
                      task is generating generic jars (i.e. no vendor-specific
                      deployment elements have been specified).</td>
-    <td valign="top" align="center">Yes</td>
+    <td valign="top" align="center">Yes, unless vendor-specific deployment elements
+    have been specified.</td>
   </tr>
   <tr>
     <td valign="top">cmpversion</td>
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/JbossDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/JbossDeploymentTool.java
index 4b0573093..851a2fbb4 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/JbossDeploymentTool.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/JbossDeploymentTool.java
@@ -120,7 +120,14 @@ public class JbossDeploymentTool extends GenericDeploymentTool {
      * of this jar will be checked against the dependent bean classes.
      */
     File getVendorOutputJarFile(String baseName) {
-        return new File(getParent().getDestdir(), baseName + jarSuffix);
+        if (getDestDir() == null && getParent().getDestdir() == null) {
+            throw new BuildException("DestDir not specified");
+        }
+        if (getDestDir() == null) {
+            return new File(getParent().getDestdir(), baseName + jarSuffix);
+        } else {
+            return new File(getDestDir(), baseName + jarSuffix);
+        }
     }
 
     /**