diff --git a/core/src/main/java/hudson/ClassicPluginStrategy.java b/core/src/main/java/hudson/ClassicPluginStrategy.java
index dbcb225535..27fdc85d27 100644
--- a/core/src/main/java/hudson/ClassicPluginStrategy.java
+++ b/core/src/main/java/hudson/ClassicPluginStrategy.java
@@ -239,7 +239,8 @@ public class ClassicPluginStrategy implements PluginStrategy {
         new DetachedPlugin("maven-plugin","1.296","1.296"),
         new DetachedPlugin("subversion","1.310","1.0"),
         new DetachedPlugin("cvs","1.340","0.1"),
-        new DetachedPlugin("ant","1.431","1.0")
+        new DetachedPlugin("ant","1.431","1.0"),
+        new DetachedPlugin("javadoc","1.431","1.0")
     );
 
     /**
diff --git a/war/pom.xml b/war/pom.xml
index 4e98755029..1c3fee4294 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -238,6 +238,12 @@ THE SOFTWARE.
                   <version>1.0-SNAPSHOT</version>
                   <type>hpi</type>
                 </artifactItem>
+                <artifactItem>
+                  <groupId>org.jenkins-ci.plugins</groupId>
+                  <artifactId>javadoc</artifactId>
+                  <version>1.0-SNAPSHOT</version>
+                  <type>hpi</type>
+                </artifactItem>
                 <artifactItem>
                   <groupId>org.jenkins-ci.plugins</groupId>
                   <artifactId>translation</artifactId>