diff --git a/bootstrap.bat b/bootstrap.bat
index 770076cce..937982de6 100755
--- a/bootstrap.bat
+++ b/bootstrap.bat
@@ -58,7 +58,46 @@ copy %TOOLS%\ant\types\*.properties %CLASSDIR%\org\apache\tools\ant\types
 echo.
 echo ... Building Ant Distribution
 
-"%JAVA%" %ANT_OPTS% org.apache.tools.ant.Main -emacs bootstrap
+if not "%OS%"=="Windows_NT" goto win9xStart
+:winNTStart
+@setlocal
+
+REM parse command line arguments
+rem Need to check if we are using the 4NT shell...
+if "%eval[2+2]" == "4" goto setup4NT
+
+rem On NT/2K grab all arguments at once
+set ANT_CMD_LINE_ARGS=%*
+goto doneStart
+
+:setup4NT
+set ANT_CMD_LINE_ARGS=%$
+goto doneStart
+
+:win9xStart
+rem Slurp the command line arguments.  This loop allows for an unlimited number of 
+rem agruments (up to the command line limit, anyway).
+
+set ANT_CMD_LINE_ARGS=
+
+:setupArgs
+if %1a==a goto doneStart
+set ANT_CMD_LINE_ARGS=%ANT_CMD_LINE_ARGS% %1
+shift
+goto setupArgs
+
+:doneStart
+rem This label provides a place for the argument list loop to break out 
+rem and for NT handling to skip to.
+
+"%JAVA%" %ANT_OPTS% org.apache.tools.ant.Main -emacs %ANT_CMD_LINE_ARGS% bootstrap
+
+set ANT_CMD_LINE_ARGS=
+if not "%OS%"=="Windows_NT" goto mainEnd
+:winNTend
+@endlocal
+
+:mainEnd
 
 echo.
 echo ... Cleaning Up Build Directories
diff --git a/bootstrap.sh b/bootstrap.sh
index 92519bc9f..78657cd32 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -117,7 +117,7 @@ chmod +x bin/antRun
 
 echo ... Building Ant Distribution
 
-"${JAVACMD}" -classpath "${CLASSPATH}" -Dant.home=. org.apache.tools.ant.Main -emacs bootstrap
+"${JAVACMD}" -classpath "${CLASSPATH}" -Dant.home=. org.apache.tools.ant.Main -emacs "$@" bootstrap
 
 echo ... Cleaning Up Build Directories
 
diff --git a/docs/faq.html b/docs/faq.html
index 53807613b..88525c989 100644
--- a/docs/faq.html
+++ b/docs/faq.html
@@ -92,6 +92,26 @@
     <tr><td>
       <blockquote>
                       <table border="0" cellspacing="0" cellpadding="2" width="100%">
+    <tr><td bgcolor="#828DA6">
+      <font color="#ffffff" face="arial,helvetica,sanserif">
+        <strong>About this FAQ</strong>
+      </font>
+    </td></tr>
+    <tr><td>
+      <blockquote>
+        <ul>
+                    <li><a href="#latest-version">
+  Where do I find the latest version of this
+        document?
+  </a></li>
+                    <li><a href="#adding-faqs">
+  How can I contribute to this FAQ?
+  </a></li>
+                </ul>
+      </blockquote>
+    </td></tr>
+  </table>
+                <table border="0" cellspacing="0" cellpadding="2" width="100%">
     <tr><td bgcolor="#828DA6">
       <font color="#ffffff" face="arial,helvetica,sanserif">
         <strong>General</strong>
@@ -243,7 +263,45 @@
     </td></tr>
     <tr><td>
       <blockquote>
-                      <a name="what-is-ant">
+                      <a name="latest-version">
+  <table border="0" cellspacing="0" cellpadding="2" width="100%">
+    <tr><td bgcolor="#828DA6">
+      <font color="#ffffff" face="arial,helvetica,sanserif">
+        <strong>
+          Where do I find the latest version of this
+        document?
+        </strong>
+      </font>
+    </td></tr>
+    <tr><td>
+      <blockquote>
+                              <p><a href="http://jakarta.apache.org/ant/faq.html">here</a>.</p>
+                        </blockquote>
+    </td></tr>
+  </table>
+  </a>
+        <a name="adding-faqs">
+  <table border="0" cellspacing="0" cellpadding="2" width="100%">
+    <tr><td bgcolor="#828DA6">
+      <font color="#ffffff" face="arial,helvetica,sanserif">
+        <strong>
+          How can I contribute to this FAQ?
+        </strong>
+      </font>
+    </td></tr>
+    <tr><td>
+      <blockquote>
+                              <p>The page you are looking it is generated from 
+          <a href="http://cvs.apache.org/viewcvs.cgi/~checkout~/jakarta-ant/xdocs/faq.xml">this</a>
+
+          document.  If you want to add a new question, please submit
+          a patch against this document, the structure is hoped to be
+          self-explaining.</p>
+                        </blockquote>
+    </td></tr>
+  </table>
+  </a>
+                        <a name="what-is-ant">
   <table border="0" cellspacing="0" cellpadding="2" width="100%">
     <tr><td bgcolor="#828DA6">
       <font color="#ffffff" face="arial,helvetica,sanserif">
diff --git a/xdocs/faq.xml b/xdocs/faq.xml
index 275e18640..d7e62ab30 100644
--- a/xdocs/faq.xml
+++ b/xdocs/faq.xml
@@ -6,6 +6,28 @@
     <title>Frequently Asked Questions</title>
   </properties>
 
+  <faqsection title="About this FAQ">
+    <faq id="latest-version">
+      <question>Where do I find the latest version of this
+        document?</question>
+      <answer>
+        <p><a href="http://jakarta.apache.org/ant/faq.html">here</a>.</p>
+      </answer>
+    </faq>
+
+    <faq id="adding-faqs">
+      <question>How can I contribute to this FAQ?</question>
+      <answer>
+        <p>The page you are looking it is generated from 
+          <a href="http://cvs.apache.org/viewcvs.cgi/~checkout~/jakarta-ant/xdocs/faq.xml">this</a>
+
+          document.  If you want to add a new question, please submit
+          a patch against this document, the structure is hoped to be
+          self-explaining.</p>
+      </answer>
+    </faq>
+  </faqsection>
+
   <faqsection title="General">
     <faq id="what-is-ant">
       <question>What is Apache Ant?</question>