diff --git a/docs/resources.html b/docs/resources.html
index 1e8ad096e..3575815d4 100644
--- a/docs/resources.html
+++ b/docs/resources.html
@@ -84,6 +84,86 @@
             </td>
           <td align="left" valign="top">
         <table border="0" cellspacing="0" cellpadding="2" width="100%">
+    <tr><td bgcolor="#525D76">
+      <font color="#ffffff" face="arial,helvetica,sanserif">
+        <a name="FAQs"><strong>FAQs</strong></a>
+      </font>
+    </td></tr>
+    <tr><td>
+      <blockquote>
+                          <table border="0" cellspacing="0" cellpadding="2" width="100%">
+    <tr><td bgcolor="#828DA6">
+      <font color="#ffffff" face="arial,helvetica,sanserif">
+        <a name="At Ant's website"><strong>At Ant's website</strong></a>
+      </font>
+    </td></tr>
+    <tr><td>
+      <blockquote>
+                          <table>
+              <tr>
+                  <td bgcolor="#039acc" colspan="" rowspan="" 
+      valign="top" align="left">
+    <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+          FAQ
+        </font>
+  </td>
+                      <td bgcolor="#a0ddf0" colspan="" rowspan="" 
+      valign="top" align="left">
+    <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+          <a href="faq.html">http://jakarta.apache.org/ant/faq.html</a>
+        </font>
+  </td>
+      </tr>
+        </table>
+                    </blockquote>
+    </td></tr>
+  </table>
+                                  <table border="0" cellspacing="0" cellpadding="2" width="100%">
+    <tr><td bgcolor="#828DA6">
+      <font color="#ffffff" face="arial,helvetica,sanserif">
+        <a name="jGuru"><strong>jGuru</strong></a>
+      </font>
+    </td></tr>
+    <tr><td>
+      <blockquote>
+                        <p>jGuru hosts an interactive Ant discussion forum and FAQ system</p>
+                                  <table>
+              <tr>
+                  <td bgcolor="#039acc" colspan="" rowspan="" 
+      valign="top" align="left">
+    <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+          Forum
+        </font>
+  </td>
+                      <td bgcolor="#a0ddf0" colspan="" rowspan="" 
+      valign="top" align="left">
+    <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+          <a href="http://www.jguru.com/forums/home.jsp?topic=Ant">http://www.jguru.com/forums/home.jsp?topic=Ant</a>
+        </font>
+  </td>
+      </tr>
+                  <tr>
+                  <td bgcolor="#039acc" colspan="" rowspan="" 
+      valign="top" align="left">
+    <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+          FAQ
+        </font>
+  </td>
+                      <td bgcolor="#a0ddf0" colspan="" rowspan="" 
+      valign="top" align="left">
+    <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+          <a href="http://www.jguru.com/faq/home.jsp?topic=Ant">http://www.jguru.com/faq/home.jsp?topic=Ant</a>
+        </font>
+  </td>
+      </tr>
+        </table>
+                    </blockquote>
+    </td></tr>
+  </table>
+                    </blockquote>
+    </td></tr>
+  </table>
+        <table border="0" cellspacing="0" cellpadding="2" width="100%">
     <tr><td bgcolor="#525D76">
       <font color="#ffffff" face="arial,helvetica,sanserif">
         <a name="Articles and Presentations"><strong>Articles and Presentations</strong></a>
@@ -91,7 +171,7 @@
     </td></tr>
     <tr><td>
       <blockquote>
-                        <p>This page lists articles and presentations written about Ant.  If
+                        <p>The following sections list articles and presentations written about Ant.  If
       you've written something that should be included, please post it to one
       of the mailing lists.</p>
                     </blockquote>
diff --git a/xdocs/resources.xml b/xdocs/resources.xml
index 13169fa18..aca648689 100644
--- a/xdocs/resources.xml
+++ b/xdocs/resources.xml
@@ -7,10 +7,36 @@
   </properties>
 
   <body>
+
+    <section name="FAQs">
+      <subsection name="At Ant's website">
+        <table>
+          <tr>
+            <th>FAQ</th>
+            <td><a href="faq.html">http://jakarta.apache.org/ant/faq.html</a></td>
+          </tr>
+        </table>
+      </subsection>
+
+      <subsection name="jGuru">
+        <p>jGuru hosts an interactive Ant discussion forum and FAQ system</p>
+
+        <table>
+          <tr>
+            <th>Forum</th>
+            <td><a href="http://www.jguru.com/forums/home.jsp?topic=Ant">http://www.jguru.com/forums/home.jsp?topic=Ant</a></td>
+          </tr>
+          <tr>
+            <th>FAQ</th>
+            <td><a href="http://www.jguru.com/faq/home.jsp?topic=Ant">http://www.jguru.com/faq/home.jsp?topic=Ant</a></td>
+          </tr>
+        </table>
+      </subsection>
+    </section>
     
     <section name="Articles and Presentations">
 
-      <p>This page lists articles and presentations written about Ant.  If
+      <p>The following sections list articles and presentations written about Ant.  If
       you've written something that should be included, please post it to one
       of the mailing lists.</p>
 
