diff --git a/docs/external.html b/docs/external.html
index ab3cdfa1f..fdd2c9eeb 100644
--- a/docs/external.html
+++ b/docs/external.html
@@ -2706,7 +2706,7 @@
         <a name="J2ME Ant Tasks"></a>
         J2ME Ant Tasks
       </h4>
-                        <p>There are different sets of tasks to help build <a href="http://java.sun.com/j2me/">Java 2 Platform, Micro
+                        <p>There are different sets of tasks to help build <a href="http://www.oracle.com/technetwork/java/javame/overview/index.html">Java 2 Platform, Micro
         Edition</a> (J2ME) applications.</p>
                                       <h5 class="subsection">
         <a name="Antenna"></a>
diff --git a/docs/faq.html b/docs/faq.html
index ce786efdb..d347a620e 100644
--- a/docs/faq.html
+++ b/docs/faq.html
@@ -1470,7 +1470,7 @@ shell-prompt&gt; m4 foo.m4 &gt; foo
     </p>
                   <p>
           Ant implements the Java
-          <a href="http://java.sun.com/j2se/1.4.2/docs/guide/jar/jar.html">Jar
+          <a href="http://download.oracle.com/javase/1.4.2/docs/guide/jar/jar.html">Jar
           file specification</a>. Please refer to the notes section where it
           discusses the maximum allowable length of a line and the concept of
           continuation characters.
@@ -1672,7 +1672,7 @@ while(&lt;STDIN&gt;) {
         BuildListener that sends out an email
         in the buildFinished() method.  Will Glozer
         &lt;will.glozer@jda.com&gt; has written such a listener based
-        on <a href="http://java.sun.com/products/javamail/">JavaMail</a>.
+        on <a href="http://www.oracle.com/technetwork/java/index-jsp-139225.html">JavaMail</a>.
         The source is:</p>
                         <pre class="code">
 import java.io.*;
@@ -1811,7 +1811,7 @@ ant -listener BuildMonitor -logfile build.log
 </pre>
                         <p>Make sure that <code>mail.jar</code> from JavaMail and
         <code>activation.jar</code> from the
-        <a href="http://java.sun.com/products/javabeans/glasgow/jaf.html">Java
+        <a href="http://www.oracle.com/technetwork/java/javase/jaf-135115.html">Java
         Beans Activation Framework</a> are in your <code>CLASSPATH</code>.</p>
                     <p class="faq">
       <a name="listener-properties"></a>
@@ -1941,7 +1941,7 @@ mv /tmp/foo $ANT_HOME/bin/antRun
         requires you to have <code>junit.jar</code> in Ant's startup
         classpath even if <code>ant-junit.jar</code> is present there.</p>
                         <p>Ant's class loader implementation uses Java's
-        delegation model, see <a href="http://java.sun.com/products/jdk/1.2/docs/api/java/lang/ClassLoader.html">http://java.sun.com/products/jdk/1.2/docs/api/java/lang/ClassLoader.html</a>
+        delegation model, see <a href="http://download.oracle.com/javase/6/docs/api/java/lang/ClassLoader.html">http://download.oracle.com/javase/6/docs/api/java/lang/ClassLoader.html</a>
         the paragraph</p>
                         <blockquote>The <code>ClassLoader</code> class uses a
         delegation model to search for classes and resources. Each
diff --git a/docs/legal.html b/docs/legal.html
index 5bf800f49..459af9fe4 100644
--- a/docs/legal.html
+++ b/docs/legal.html
@@ -209,7 +209,7 @@
       The Apache Software Foundation.</p>
                                 <p>Sun, Sun Microsystems, Solaris, Java, JavaServer Web
       Development Kit, and JavaServer Pages are trademarks or
-      registered trademarks of Sun Microsystems, Inc. UNIX is a
+      registered trademarks of Oracle Corporation. UNIX is a
       registered trademark in the United States and other countries,
       exclusively licensed through X/Open Company, Ltd.  Windows,
       WindowsNT, and Win32 are registered trademarks of Microsoft