diff --git a/docs/faq.html b/docs/faq.html
index 789715d54..89e0c14c5 100644
--- a/docs/faq.html
+++ b/docs/faq.html
@@ -317,6 +317,9 @@
   The <code>ant</code> wrapper script of Ant 1.5 fails
       for Cygwin if <code>ANT_HOME</code> is set to a Windows style
       path.
+      </a></li>
+                <li><a href="#1.5.2-zip-broken">
+  <code>&lt;zip&gt;</code> is broken in Ant 1.5.2.
       </a></li>
             </ul>
     
@@ -1389,9 +1392,24 @@ mv /tmp/foo $ANT_HOME/bin/antRun
     </p>
                   <p>This problem has been reported only hours after Ant 1.5 has
         been released, see <a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=10664">Bug
-        10664</a> and all it's duplicates.</p>
+        10664</a> and all its duplicates.</p>
                         <p>A fixed version of the wrapper script can be found <a href="http://ant.apache.org/old-releases/v1.5/errata/">here</a>.
         Simply replace your script with this version.</p>
+                    <p class="faq">
+      <a name="1.5.2-zip-broken"></a>
+      <code>&lt;zip&gt;</code> is broken in Ant 1.5.2.
+    </p>
+                  <p>Yes, it is.</p>
+                        <p>The problem reported by most people - see <a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=17648">Bug
+        17648</a> and all its duplicates - is that Ant creates
+        archives that a partially unreadable by WinZIP.  Luckily
+        <code>jar</code> deals with the archives and so the generated
+        jars/wars/ears will most likely work for you anyway.</p>
+                        <p>There are additional problems, see bugs <a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=17780">Bug
+        17780</a>, <a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=17871">Bug
+        17871</a> and <a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=18403">Bug
+        18403</a>.  All of them are supposed to be fixed with Ant
+        1.5.3 (and only 18403 should exist in 1.5.3beta1).</p>
                     </div>
 
         <p class="copyright">
diff --git a/xdocs/faq.xml b/xdocs/faq.xml
index d6cf0320d..68a418ee0 100644
--- a/xdocs/faq.xml
+++ b/xdocs/faq.xml
@@ -1204,13 +1204,38 @@ mv /tmp/foo $ANT_HOME/bin/antRun
         <p>This problem has been reported only hours after Ant 1.5 has
         been released, see <a
         href="http://issues.apache.org/bugzilla/show_bug.cgi?id=10664">Bug
-        10664</a> and all it's duplicates.</p>
+        10664</a> and all its duplicates.</p>
 
         <p>A fixed version of the wrapper script can be found <a
         href="http://ant.apache.org/old-releases/v1.5/errata/">here</a>.
         Simply replace your script with this version.</p>
       </answer>
     </faq>
+
+    <faq id="1.5.2-zip-broken">
+      <question><code>&lt;zip&gt;</code> is broken in Ant 1.5.2.</question>
+      <answer>
+
+        <p>Yes, it is.</p>
+
+        <p>The problem reported by most people - see <a
+        href="http://issues.apache.org/bugzilla/show_bug.cgi?id=17648">Bug
+        17648</a> and all its duplicates - is that Ant creates
+        archives that a partially unreadable by WinZIP.  Luckily
+        <code>jar</code> deals with the archives and so the generated
+        jars/wars/ears will most likely work for you anyway.</p>
+
+        <p>There are additional problems, see bugs <a
+        href="http://issues.apache.org/bugzilla/show_bug.cgi?id=17780">Bug
+        17780</a>, <a
+        href="http://issues.apache.org/bugzilla/show_bug.cgi?id=17871">Bug
+        17871</a> and <a
+        href="http://issues.apache.org/bugzilla/show_bug.cgi?id=18403">Bug
+        18403</a>.  All of them are supposed to be fixed with Ant
+        1.5.3 (and only 18403 should exist in 1.5.3beta1).</p>
+      </answer>
+    </faq>
+
   </faqsection>
 
 </document>