diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 17022c788..65a1cfa6a 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -233,6 +233,7 @@ Mariusz Nowostawski
 Mark A. Ziesemer
 Mark DeLaFranier
 Mark Hecker
+Mark Niggemann
 Mark R. Diggory
 Mark Salter
 Markus Kahl
diff --git a/WHATSNEW b/WHATSNEW
index aa2ad036c..42f49a77b 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -22,6 +22,9 @@ Other changes:
    override the current time/date used by <tstamp>.
    Bugzilla Report 61079
 
+ * added Orion support to ejbjar
+   Github Pull Request #33
+
 Changes from Ant 1.9.8 TO Ant 1.9.9
 ===================================
 
diff --git a/contributors.xml b/contributors.xml
index ee049cb17..fd404f826 100644
--- a/contributors.xml
+++ b/contributors.xml
@@ -959,6 +959,10 @@
     <middle>R.</middle>
     <last>Diggory</last>
   </name>
+  <name>
+    <first>Mark</first>
+    <last>Niggemann</last>
+  </name>
   <name>
     <first>Mark</first>
     <middle>A.</middle>
diff --git a/manual/Tasks/ejb.html b/manual/Tasks/ejb.html
index c97650988..68f7e9169 100644
--- a/manual/Tasks/ejb.html
+++ b/manual/Tasks/ejb.html
@@ -62,7 +62,7 @@ In general these tasks are specific to the particular vendor's EJB Server.</p>
   <li><a href="http://www.jboss.org/" target="_top">
   JBoss 2.1</a> and above EJB servers</li>
   <li><a href="http://web.archive.org/web/20080516210506/http://www.ironflare.com/">
-  Orion Application Server</a> 2.0</li>
+  Orion Application Server</a> 2.0 <em>since 1.9.10</em></li>
   <li><a href="http://www.bea.com" target="_top">Weblogic</a>
    4.5.1 through to 7.0 EJB servers</li>
   <li><a href="http://www.objectweb.org/jonas/" target="_top">JOnAS</a>
@@ -1789,7 +1789,7 @@ to the final ejb jar file. Orion has one deployment descriptor:
   </tr>
   <tr>
     <td valign="top">destdir</td>
-    <td valign="top">The base directory into which the generated 
+    <td valign="top">The base directory into which the generated
                      jar files are deposited. Jar files are deposited in
                      directories corresponding to their location within the
                      descriptordir namespace. </td>
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbJar.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbJar.java
index 2981cab42..6e7166b03 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbJar.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbJar.java
@@ -226,6 +226,7 @@ public class EjbJar extends MatchingTask {
      * deployment tool for Orion server.
      *
      * @return the deployment tool instance to be configured.
+     * @since Ant 1.9.10
      */
     public OrionDeploymentTool createOrion() {
         OrionDeploymentTool tool = new OrionDeploymentTool();
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/OrionDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/OrionDeploymentTool.java
index 058e2e47d..93bbbc0dd 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/OrionDeploymentTool.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/OrionDeploymentTool.java
@@ -23,19 +23,18 @@ import java.util.Hashtable;
 import org.apache.tools.ant.Project;
 
 /**
- * The deployment tool to add the orion specific deployment descriptor to the 
- * ejb jar file. Orion only requires one additional file orion-ejb-jar.xml 
+ * The deployment tool to add the orion specific deployment descriptor to the
+ * ejb jar file. Orion only requires one additional file orion-ejb-jar.xml
  * and does not require any additional compilation.
  *
- * @author <a href="mailto:mark.niggemann@ge.com">Mark Niggemann</a>
- * @version 1.0
+ * @since Ant 1.9.10
  * @see EjbJar#createOrion
  */
 
 public class OrionDeploymentTool extends GenericDeploymentTool {
-    
+
     protected static final String ORION_DD = "orion-ejb-jar.xml";
-    
+
 
     /** Instance variable that stores the suffix for the jboss jarfile. */
     private String jarSuffix = ".jar";
@@ -47,14 +46,14 @@ public class OrionDeploymentTool extends GenericDeploymentTool {
     protected void addVendorFiles(Hashtable ejbFiles, String baseName) {
         String ddPrefix = (usingBaseJarName() ? "" : baseName );
         File orionDD = new File(getConfig().descriptorDir, ddPrefix + ORION_DD);
-        
+
         if (orionDD.exists()) {
             ejbFiles.put(META_DIR + ORION_DD, orionDD);
         } else {
             log("Unable to locate Orion deployment descriptor. It was expected to be in " + orionDD.getPath(), Project.MSG_WARN);
             return;
         }
-        
+
     }
 
     /**