diff --git a/WHATSNEW b/WHATSNEW
index 48170c15b..030edd77a 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -6,7 +6,10 @@ Changes that could break older environments:
 
 Fixed bugs:
 -----------
-  
+
+* docletpath attribute of javadoc ignored.
+  Bugzilla 40900.
+
 Other changes:
 --------------
 
diff --git a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
index 818f0c990..b9247c99d 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
@@ -732,7 +732,9 @@ public class Javadoc extends Task {
      * @return a new DocletInfo instance to be configured.
      */
     public DocletInfo createDoclet() {
-        doclet = new DocletInfo();
+        if (doclet == null) {
+            doclet = new DocletInfo();
+        }
         return doclet;
     }