diff --git a/build.xml b/build.xml
index 62a10f8fb..0e5e25f43 100644
--- a/build.xml
+++ b/build.xml
@@ -200,6 +200,13 @@
         <isset property="jakarta.oro.present" />
       </or>
     </condition>
+    
+    <condition property="ejbjar.support">
+      <and>
+        <isset property="bcel.present" />
+        <isset property="jdk1.2+" />
+      </and>
+    </condition>
   </target>
 
   <!--
@@ -260,9 +267,9 @@
       <exclude name="${optional.package}/ejb/DDCreator*.java" unless="ejb.DDCreator.present" />
       <exclude name="${optional.package}/ejb/WLRun.java" unless="ejb.wls.present" />
       <exclude name="${optional.package}/ejb/WLStop.java" unless="ejb.wls.present" />
-      <exclude name="${optional.package}/ejb/EjbJar.java" unless="jdk1.2+" />
-      <exclude name="${optional.package}/ejb/*DeploymentTool.java" unless="jdk1.2+" />
-      <exclude name="${optional.package}/ejb/IPlanet*.java" unless="jdk1.2+" />
+      <exclude name="${optional.package}/ejb/EjbJar.java" unless="ejbjar.support" />
+      <exclude name="${optional.package}/ejb/*DeploymentTool.java" unless="ejbjar.support" />
+      <exclude name="${optional.package}/ejb/IPlanet*.java" unless="ejbjar.support" />
       <exclude name="${optional.package}/Javah.java" unless="jdk1.2+" />
       <exclude name="${optional.package}/junit/*" unless="junit.present" />
       <exclude name="${optional.package}/net/MimeMail.java" unless="javamail.complete" />