diff --git a/docs/manual/OptionalTasks/BorlandEJBTasks.html b/docs/manual/OptionalTasks/BorlandEJBTasks.html
index 764d46dd4..276d54a1e 100644
--- a/docs/manual/OptionalTasks/BorlandEJBTasks.html
+++ b/docs/manual/OptionalTasks/BorlandEJBTasks.html
@@ -17,6 +17,11 @@
   Enterprise Server 5.x. It  generates and compiles the stubs and skeletons for all ejb described into the
   Deployment Descriptor, builds the jar file including the support files and
   verify whether the produced jar is valid or not.</p>
+
+<p>Benoit Moussaud maintains a separate <a
+href="http://www.moussaud.org/ejbjar.html">FAQ</a> for this task at
+his homepage.</p>
+
 <h3>Borland element</h3>
 <table border="1" cellpadding="2" cellspacing="0">
   <tr>
diff --git a/docs/manual/OptionalTasks/ejb.html b/docs/manual/OptionalTasks/ejb.html
index 4f9d91f88..1db596d83 100644
--- a/docs/manual/OptionalTasks/ejb.html
+++ b/docs/manual/OptionalTasks/ejb.html
@@ -60,12 +60,12 @@ In general these tasks are specific to the particular vendor's EJB Server.</p>
 <h2><a name="ejbtasks">EJB Tasks</a></h2>
 <table border="1" cellpadding="5">
  <tr><td>Task</td><td colspan="2">Application Servers</td></tr>
- <tr><td><a href="BorlandGenerateClient.html">blgenclient</a></td><td colspan="2">Borland Application Server 4.5</td></tr>
+ <tr><td><a href="BorlandGenerateClient.html">blgenclient</a></td><td colspan="2">Borland Application Server 4.5 and 5.x</td></tr>
  <tr><td><a href="#ddcreator">ddcreator</a></td><td colspan="2">Weblogic 4.5.1</td></tr>
  <tr><td><a href="#ejbc">ejbc</a></td><td colspan="2">Weblogic 4.5.1</td></tr>
  <tr><td><a href="#iplanet-ejbc">iplanet-ejbc</a></td><td colspan="2">iPlanet Application Server 6.0</td></tr>
  <tr><td rowspan="7"><a href="#ejbjar">ejbjar</a></td><td colspan="2" align="center"><b>Nested Elements</b></td></tr>
- <tr><td><a href="BorlandEJBTasks.html">borland</a></td><td>Borland Application Server 4.5</td></tr>
+ <tr><td><a href="BorlandEJBTasks.html">borland</a></td><td>Borland Application Server 4.5 and 5.x</td></tr>
  <tr><td><a href="#ejbjar_iplanet">iPlanet</a></td><td>iPlanet Application Server 6.0</td></tr>
  <tr><td><a href="#ejbjar_jboss">jboss</a></td><td>JBoss</td></tr>
  <tr><td><a href="#ejbjar_jonas">jonas</a></td><td>JOnAS 2.4.x and 2.5</td></tr>
diff --git a/docs/resources.html b/docs/resources.html
index 17954d319..20dfc481d 100644
--- a/docs/resources.html
+++ b/docs/resources.html
@@ -214,6 +214,25 @@
       valign="top" align="left">
           <a href="http://www.jguru.com/faq/home.jsp?topic=Ant">http://www.jguru.com/faq/home.jsp?topic=Ant</a>
       </td>
+      </tr>
+        </table>
+                                                    <h4 class="subsection">
+        <a name="FAQ about Borland Application Server tasks"></a>
+        FAQ about Borland Application Server tasks
+      </h4>
+                        <p>Benoit Moussaud, the original author if the Borland
+        Application Server specific <a href="manual/OptionalTasks/ejb.html#ejbtasks">EJB tasks</a> has put
+        together a FAQ for this specific subtask.</p>
+                                      <table class="externals" cellspacing="1" cellpadding="4">
+              <tr>
+                      <th colspan="1" rowspan="1"
+      valign="top" align="left">
+          FAQ:
+      </th>
+                          <td colspan="1" rowspan="1"
+      valign="top" align="left">
+          <a href="http://www.moussaud.org/ejbjar.html">http://www.moussaud.org/ejbjar.html</a>
+      </td>
       </tr>
         </table>
                                       <h3 class="section">
diff --git a/xdocs/resources.xml b/xdocs/resources.xml
index 5adf2c80f..109d30eee 100644
--- a/xdocs/resources.xml
+++ b/xdocs/resources.xml
@@ -36,6 +36,20 @@
           </tr>
         </table>
       </subsection>
+
+      <subsection name="FAQ about Borland Application Server tasks">
+        <p>Benoit Moussaud, the original author if the Borland
+        Application Server specific <a
+        href="manual/OptionalTasks/ejb.html#ejbtasks">EJB tasks</a> has put
+        together a FAQ for this specific subtask.</p>
+
+        <table class="externals">
+          <tr>
+            <th>FAQ:</th>
+            <td><a href="http://www.moussaud.org/ejbjar.html">http://www.moussaud.org/ejbjar.html</a></td>
+          </tr>
+        </table>
+      </subsection>
     </section>
 
     <section name="Books">