diff --git a/ejb/plugin.jelly b/ejb/plugin.jelly
index 5f400779..be18af96 100644
--- a/ejb/plugin.jelly
+++ b/ejb/plugin.jelly
@@ -44,7 +44,9 @@
 
     <!-- jar task used for now due to problems with ejb jar not including 
          files other than class files -->
-    <ant:jar jarfile="${maven.ejb.final.name}">
+    <ant:jar
+      jarfile="${maven.ejb.final.name}"
+      index="${maven.ejb.index}">
       
       <!-- include marked dependencies -->
       <j:forEach var="lib" items="${pom.artifacts}">
@@ -116,6 +118,7 @@
     <ant:jar jarfile="${maven.build.dir}/${maven.final.name}-client.jar"
              basedir="${maven.build.dest}"
              excludes="${maven.ejb.client.base.excludes},${maven.ejb.client.excludes}"
+             index="${maven.ejb.client.index}"
              >
     </ant:jar>
   </goal>
diff --git a/ejb/plugin.properties b/ejb/plugin.properties
index a599d2aa..69358a3f 100644
--- a/ejb/plugin.properties
+++ b/ejb/plugin.properties
@@ -3,6 +3,9 @@
 # -------------------------------------------------------------------
 # ejb plugin.
 # -------------------------------------------------------------------
+maven.ejb.index=false
+maven.ejb.client.index=false
+
 # Location of where ejb sources (non-java) are located.
 maven.ejb.src=${maven.src.dir}/ejb
 # Location of ejb xml configs - not used atm due to using jar task not ejbjar
diff --git a/ejb/xdocs/changes.xml b/ejb/xdocs/changes.xml
index 48d5dfc7..d97a535b 100644
--- a/ejb/xdocs/changes.xml
+++ b/ejb/xdocs/changes.xml
@@ -6,6 +6,9 @@
   </properties>
   <body>
     <release version="1.1" date="in CVS">
+      <action dev="evenisse" type="add">
+        Added maven.ejb.index, maven.ejb.index properties.
+      </action>
       <action dev="evenisse" type="add">
         Added maven.ejb.excludes and maven.ejb.includes properties.
       </action>
diff --git a/ejb/xdocs/properties.xml b/ejb/xdocs/properties.xml
index c586b34f..e9186f1a 100644
--- a/ejb/xdocs/properties.xml
+++ b/ejb/xdocs/properties.xml
@@ -10,6 +10,14 @@
     <section name="ejb jar settings">
       <table>
         <tr><th>Property</th><th>Optional?</th><th>Description</th><th>Default</th></tr>
+        <tr>
+          <td>maven.ejb.index</td>
+          <td>Yes</td>
+          <td>
+            Whether to create an index list to speed up classloading. 
+            This is a JDK 1.3+ specific feature. Defaults to false.
+          </td>
+        </tr>
         <tr>
           <td>maven.ejb.src</td>
           <td>Yes</td>
@@ -40,6 +48,14 @@
           </td>
           <td>**/package.html</td>
         </tr>
+        <tr>
+          <td>maven.ejb.client.index</td>
+          <td>Yes</td>
+          <td>
+            Whether to create an index list to speed up classloading. 
+            This is a JDK 1.3+ specific feature. Defaults to false.
+          </td>
+        </tr>
         <tr>
           <td>maven.ejb.client.base.excludes</td>
           <td>Yes</td>

Property	Optional?	Description
maven.ejb.index	Yes	+ Whether to create an index list to speed up classloading. + This is a JDK 1.3+ specific feature. Defaults to false. +
maven.ejb.src	Yes	**/package.html
maven.ejb.client.index	Yes	+ Whether to create an index list to speed up classloading. + This is a JDK 1.3+ specific feature. Defaults to false. +
maven.ejb.client.base.excludes	Yes