diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 114272f34..35df55ef9 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -50,6 +50,7 @@ Cyrille Morvan
 D'Arcy Smith
 Dale Anson
 Dan Armbrust
+Daniel Henrique
 Daniel Ribagnac
 Daniel Spilker
 Danno Ferrin
diff --git a/WHATSNEW b/WHATSNEW
index 57de52a01..ea899f2b0 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -120,6 +120,9 @@ Fixed bugs:
    writing anything.
    Bugzilla Report 32200
 
+ * The IPlanetDeploymentToll didn't use the configured DTD locations.
+   Bugzilla Report 31876.
+
 Other changes:
 --------------
 
diff --git a/contributors.xml b/contributors.xml
index 5c376a45f..5ae2e5ebc 100644
--- a/contributors.xml
+++ b/contributors.xml
@@ -223,6 +223,10 @@
     <first>Dan</first>
     <last>Armbrust</last>
   </name>
+  <name>
+    <first>Daniel</first>
+    <last>Henrique</last>
+  </name>
   <name>
     <first>Daniel</first>
     <last>Ribagnac</last>
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetDeploymentTool.java
index c64ca0e65..b48abad87 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetDeploymentTool.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetDeploymentTool.java
@@ -21,6 +21,7 @@ package org.apache.tools.ant.taskdefs.optional.ejb;
 import java.io.File;
 import java.io.IOException;
 import java.util.Hashtable;
+import java.util.Iterator;
 import javax.xml.parsers.SAXParser;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
@@ -252,6 +253,15 @@ public class IPlanetDeploymentTool extends GenericDeploymentTool {
         if (iashome != null) {
             ejbc.setIasHomeDir(iashome);
         }
+        if (getConfig().dtdLocations != null) {
+            for (Iterator i = getConfig().dtdLocations.iterator();
+                 i.hasNext(); ) {
+                EjbJar.DTDLocation dtdLocation =
+                    (EjbJar.DTDLocation) i.next();
+                ejbc.registerDTD(dtdLocation.getPublicId(),
+                                 dtdLocation.getLocation());
+            }
+        }
 
         /* Execute the ejbc utility -- stubs/skeletons are rebuilt, if needed */
         try {