diff --git a/parent/pom.xml b/parent/pom.xml
index 4d514022..fc144ef7 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -152,8 +152,8 @@
 						<javadocDirectory>${basedir}/src/main/javadoc</javadocDirectory>
 						<excludePackageNames>org.springframework.ldap.samples:org.springframework.ldap.itest</excludePackageNames>
 						<links>
-							<link>http://java.sun.com/j2se/1.4.2/docs/api</link>
-							<link>http://java.sun.com/j2se/1.5.0/docs/api</link>
+							<link>http://download.oracle.com/javase/1.4.2/docs/api</link>
+							<link>http://download.oracle.com/javase/1.5.0/docs/api</link>
 							<link>http://static.springframework.org/spring/docs/2.5.x/api/</link>
 							<link>http://logging.apache.org/log4j/1.2/apidocs/</link>
 							<link>http://commons.apache.org/logging/apidocs/</link>
diff --git a/pom.xml b/pom.xml
index b099a7b9..ba1070a7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -328,8 +328,8 @@
 						<javadocDirectory>${basedir}/src/main/javadoc</javadocDirectory>
 						<excludePackageNames>org.springframework.ldap.samples:org.springframework.ldap.itest</excludePackageNames>
 						<links>
-							<link>http://java.sun.com/j2se/1.4.2/docs/api</link>
-							<link>http://java.sun.com/j2se/1.5.0/docs/api</link>
+							<link>http://download.oracle.com/javase/1.4.2/docs/api</link>
+							<link>http://download.oracle.com/javase/1.5.0/docs/api</link>
 							<link>http://static.springframework.org/spring/docs/2.5.x/api/</link>
 							<link>http://logging.apache.org/log4j/1.2/apidocs/</link>
 							<link>http://commons.apache.org/logging/apidocs/</link>
diff --git a/src/docbkx/basic.xml b/src/docbkx/basic.xml
index c6e0f552..fc084687 100644
--- a/src/docbkx/basic.xml
+++ b/src/docbkx/basic.xml
@@ -156,7 +156,7 @@ filter.and(new WhitespaceWildcardsFilter("cn", cn));</programlisting>
     <title>Building Dynamic Distinguished Names</title>
 
     <para>The standard <ulink
-    url="http://java.sun.com/j2se/1.5.0/docs/api/javax/naming/Name.html">Name</ulink>
+    url="http://download.oracle.com/javase/1.5.0/docs/api/javax/naming/Name.html">Name</ulink>
     interface represents a generic name, which is basically an ordered
     sequence of components. The <literal>Name</literal> interface also
     provides operations on that sequence; e.g., <literal>add</literal> or
@@ -225,7 +225,7 @@ public class PersonDaoImpl implements PersonDao {
     <para><programlisting>cn=Some Person, ou=Some Company, c=Sweden, dc=example, dc=com</programlisting></para>
 
     <para>In Java 5, there is an implementation of the Name interface: <ulink
-    url="http://java.sun.com/j2se/1.5.0/docs/api/javax/naming/ldap/LdapName.html">LdapName</ulink>.
+    url="http://download.oracle.com/javase/1.5.0/docs/api/javax/naming/ldap/LdapName.html">LdapName</ulink>.
     If you are in the Java 5 world, you might as well use
     <literal>LdapName</literal>. However, you may still use
     <literal>DistinguishedName</literal> if you so wish.</para>
@@ -382,4 +382,4 @@ public class PersonDaoImpl implements PersonDao {
         </listitem>
       </orderedlist></para>
   </sect1>
-</chapter>
\ No newline at end of file
+</chapter>
diff --git a/src/docbkx/contextprocessor.xml b/src/docbkx/contextprocessor.xml
index 9f8bf51c..8c8e9495 100644
--- a/src/docbkx/contextprocessor.xml
+++ b/src/docbkx/contextprocessor.xml
@@ -123,7 +123,7 @@ public class MyCoolRequestControl extends AbstractRequestControlDirContextProces
     <note>
       <para>Make sure you use <literal>LdapContextSource</literal> when you
       use Controls. The <literal><ulink
-      url="http://java.sun.com/j2se/1.5.0/docs/api/javax/naming/ldap/Control.html">Control</ulink></literal>
+      url="http://download.oracle.com/javase/1.5.0/docs/api/javax/naming/ldap/Control.html">Control</ulink></literal>
       interface is specific for LDAPv3 and requires that
       <literal>LdapContext</literal> is used instead of
       <literal>DirContext</literal>. If an
@@ -197,4 +197,4 @@ public class MyCoolRequestControl extends AbstractRequestControlDirContextProces
     the last batch has been returned from the search.</para>
     
   </sect1>
-</chapter>
\ No newline at end of file
+</chapter>
diff --git a/src/site/apt/downloads/releases.apt b/src/site/apt/downloads/releases.apt
index d6ab742b..2c79b3e9 100644
--- a/src/site/apt/downloads/releases.apt
+++ b/src/site/apt/downloads/releases.apt
@@ -12,7 +12,7 @@ Downloads
 	
 	* <<Spring LDAP 1.3.1 is the upcoming production release>>
 
-		* {{{snapshots.html}Download nightly snapshots}}
+		* {{{./snapshots.html}Download nightly snapshots}}
 
 Sources
 
diff --git a/src/site/apt/reference.apt b/src/site/apt/reference.apt
index dfaf85bf..2aa0a669 100644
--- a/src/site/apt/reference.apt
+++ b/src/site/apt/reference.apt
@@ -6,6 +6,6 @@ Reference Manual
 
     The reference manual is available as HTML, and as PDF.
     
-    * View the {{{reference/html/index.html}HTML version}}
+    * View the {{{./reference/html/index.html}HTML version}}
     
-    * Download the {{{reference/pdf/spring-ldap-reference.pdf}PDF version}}
+    * Download the {{{./reference/pdf/spring-ldap-reference.pdf}PDF version}}