diff --git a/src/site/fml/faq.fml b/src/site/fml/faq.fml
index daedf4c1..21b3f897 100644
--- a/src/site/fml/faq.fml
+++ b/src/site/fml/faq.fml
@@ -30,43 +30,10 @@ NAMESPACE_ERR: An attempt is made to create or change an object in a way which i
     <part id="java">
         <title>Java</title>
         <faq id="java-1.3">
-            <question>Does Spring-WS run under Java 1.3?</question>
+            <question>Does Spring-WS run under Java 1.3 or 1.4?</question>
             <answer>
                 <p>
-                    Spring Web Services requires Java 1.4 or higher.
-                </p>
-            </answer>
-        </faq>
-        <faq id="java-1.4">
-            <question>Does Spring-WS work under Java 1.4?</question>
-            <answer>
-                <p>
-                    Spring Web Services works under Java 1.4, but it requires some effort to make it work. Java 1.4 is
-                    bundled with the older XML parser Crimson, which does not handle namespaces correctly. Additionally,
-                    it is bundled with an older version of Xalan, which also has problems.
-                    Unfortunately, placing newer versions of these on the class path does not override them.
-                    See <a href="http://xml.apache.org/xalan-j/faq.html#faq-N100D6">this FAQ</a> entry on the Xalan
-                    site, and also <a href="http://xerces.apache.org/xerces2-j/faq-general.html#faq-4">this entry</a>
-                    on the Xerces site.
-                </p>
-                <p>
-                    The only solution that works is to add newer versions of Xerces and Xalan in the lib/endorsed
-                    directory of your JDK, as explained in those FAQs (i.e.<tt>$JAVA_HOME/lib/endorsed</tt>).
-                    The following libraries are known to work with Java 1.4.2:
-                </p>
-                <table class="bodyTable">
-                    <tbody>
-                        <tr><th>Library</th><th>Version</th></tr>
-                        <tr><td><a href="http://xerces.apache.org/xerces2-j/">Xerces</a></td><td>2.8.1</td></tr>
-                        <tr><td><a href="http://xml.apache.org/xalan-j/">Xalan</a></td><td>2.7.0</td></tr>
-                        <tr><td><a href="http://xerces.apache.org/xerces2-j/">XML-APIs</a></td><td>1.3.04</td></tr>
-                        <tr><td><a href="http://java.sun.com/webservices/downloads/1.3/index.html">SAAJ</a></td><td>1.2</td></tr>
-                    </tbody>
-                </table>
-                <p>
-                    If you want to use WS-Security, note that the <code>XwsSecurityInterceptor</code> requires Java 5,
-                    because an underlying library (XWSS) requires it. Instead, you can use the
-                    <code>Wss4jSecurityInterceptor</code>.
+                    As of version 2.0, Spring Web Services requires Java 1.5 or higher.
                 </p>
             </answer>
         </faq>
@@ -82,21 +49,6 @@ NAMESPACE_ERR: An attempt is made to create or change an object in a way which i
                 </p>
             </answer>
         </faq>
-        <faq id="osx">
-            <question>Why do the Spring-WS unit tests fail under Mac OS X?</question>
-            <answer>
-                <p>
-                    For some reason, Apple decided to include a Java 1.4 compatibility jar with their JDK 1.5. This jar
-                    includes the XML parsers which were included in Java 1.4. No other JDK distribution does this, so it
-                    is unclear what the purpose of this compatibility jar is.
-                </p>
-                <p>
-                    The jar can be found at
-                    <tt>/System/Library/Frameworks/JavaVM.framework/Versions/1.5.0/Classes/.compatibility/14compatibility.jar</tt>.
-                    You can safely remove or rename it, and the tests will run again.
-                </p>
-            </answer>
-        </faq>
     </part>
     <part id="saaj">
         <title>SAAJ</title>