diff --git a/docs/faq.html b/docs/faq.html
index a325be86d..c30a32cb9 100644
--- a/docs/faq.html
+++ b/docs/faq.html
@@ -297,6 +297,12 @@
                     <li><a href="#delegating-classloader">
   &lt;style&gt; or &lt;junit&gt; ignores my
       &lt;classpath&gt;
+  </a></li>
+                    <li><a href="#winxp-jdk14-ant14">
+  When running Ant 1.4 on Windows XP and JDK 1.4, I get
+      various errors when trying to <code>&lt;exec&gt;</code>, fork
+      <code>&lt;java&gt;</code> or access environment
+      variables.
   </a></li>
                     <li><a href="#1.5-cygwin-sh">
   The <code>ant</code> wrapper script of Ant 1.5 fails
@@ -2039,6 +2045,33 @@ mv /tmp/foo $ANT_HOME/bin/antRun
                         </blockquote>
     </td></tr>
   </table>
+  </a>
+        <a name="winxp-jdk14-ant14">
+  <table border="0" cellspacing="0" cellpadding="2" width="100%">
+    <tr><td bgcolor="#828DA6">
+      <font color="#ffffff" face="arial,helvetica,sanserif">
+        <strong>
+          When running Ant 1.4 on Windows XP and JDK 1.4, I get
+      various errors when trying to <code>&lt;exec&gt;</code>, fork
+      <code>&lt;java&gt;</code> or access environment
+      variables.
+        </strong>
+      </font>
+    </td></tr>
+    <tr><td>
+      <blockquote>
+                              <p>Ant &lt; 1.5 doesn't recognize Windows XP as a flavor
+        of Windows that runs <code>CMD.EXE</code> instead of
+        <code>COMMAND.COM</code>.  JDK 1.3 will tell Ant that Windows
+        XP is Windows 2000 so the problem doesn't show up
+        there.</p>
+                                        <p>Apart from upgrading to Ant 1.5 or better, setting the
+        environment variable <code>ANT_OPTS</code> to
+        <code>-Dos.name=Windows_NT</code> prior to invoking Ant has
+        been confirmed as a workaround.</p>
+                        </blockquote>
+    </td></tr>
+  </table>
   </a>
         <a name="1.5-cygwin-sh">
   <table border="0" cellspacing="0" cellpadding="2" width="100%">
diff --git a/xdocs/faq.xml b/xdocs/faq.xml
index bc0888117..ecce17c5c 100644
--- a/xdocs/faq.xml
+++ b/xdocs/faq.xml
@@ -1089,6 +1089,27 @@ mv /tmp/foo $ANT_HOME/bin/antRun
       </answer>
     </faq>
 
+    <faq id="winxp-jdk14-ant14">
+      <question>When running Ant 1.4 on Windows XP and JDK 1.4, I get
+      various errors when trying to <code>&lt;exec&gt;</code>, fork
+      <code>&lt;java&gt;</code> or access environment
+      variables.</question>
+
+      <answer>
+
+        <p>Ant &lt; 1.5 doesn&apos;t recognize Windows XP as a flavor
+        of Windows that runs <code>CMD.EXE</code> instead of
+        <code>COMMAND.COM</code>.  JDK 1.3 will tell Ant that Windows
+        XP is Windows 2000 so the problem doesn&apos;t show up
+        there.</p>
+
+        <p>Apart from upgrading to Ant 1.5 or better, setting the
+        environment variable <code>ANT_OPTS</code> to
+        <code>-Dos.name=Windows_NT</code> prior to invoking Ant has
+        been confirmed as a workaround.</p>
+      </answer>
+    </faq>
+
     <faq id="1.5-cygwin-sh">
       <question>The <code>ant</code> wrapper script of Ant 1.5 fails
       for Cygwin if <code>ANT_HOME</code> is set to a Windows style