diff --git a/webpage/docs/faq.html b/webpage/docs/faq.html
index a380e496e..1b269e48d 100644
--- a/webpage/docs/faq.html
+++ b/webpage/docs/faq.html
@@ -178,6 +178,9 @@
                     <li><a href="#remove-cr">
   &lt;chmod&gt; or &lt;exec&gt; don't work in Ant
         1.3 on Unix
+  </a></li>
+                    <li><a href="#javadoc-cannot-execute">
+  JavaDoc failed: java.io.IOException: javadoc: cannot execute
   </a></li>
                 </ul>
       </blockquote>
@@ -757,6 +760,25 @@ mv /tmp/foo $ANT_HOME/bin/antRun
                         </blockquote>
     </td></tr>
   </table>
+  </a>
+        <a name="javadoc-cannot-execute">
+  <table border="0" cellspacing="0" cellpadding="2" width="100%">
+    <tr><td bgcolor="#828DA6">
+      <font color="#ffffff" face="arial,helvetica,sanserif">
+        <strong>
+          JavaDoc failed: java.io.IOException: javadoc: cannot execute
+        </strong>
+      </font>
+    </td></tr>
+    <tr><td>
+      <blockquote>
+                              <p>There is a bug in the Solaris reference implementation of
+        the JDK, see <a href="http://developer.java.sun.com/developer/bugParade/bugs/4230399.html">http://developer.java.sun.com/developer/bugParade/bugs/4230399.html</a>.
+        This also appears to be true under Linux, moving the JDK to
+        the front of the PATH fixes the problem.</p>
+                        </blockquote>
+    </td></tr>
+  </table>
   </a>
               </blockquote>
     </td></tr>
diff --git a/webpage/xdocs/faq.xml b/webpage/xdocs/faq.xml
index 50f26797d..84e72c902 100644
--- a/webpage/xdocs/faq.xml
+++ b/webpage/xdocs/faq.xml
@@ -362,6 +362,16 @@ mv /tmp/foo $ANT_HOME/bin/antRun
 ]]></source>
       </answer>
     </faq>
+
+    <faq id="javadoc-cannot-execute">
+      <question>JavaDoc failed: java.io.IOException: javadoc: cannot execute</question>
+      <answer>
+        <p>There is a bug in the Solaris reference implementation of
+        the JDK, see <a href="http://developer.java.sun.com/developer/bugParade/bugs/4230399.html">http://developer.java.sun.com/developer/bugParade/bugs/4230399.html</a>.
+        This also appears to be true under Linux, moving the JDK to
+        the front of the PATH fixes the problem.</p>
+      </answer>
+    </faq>
   </faqsection>
 
 </document>