diff --git a/build.gradle b/build.gradle
index 4826a7165d..d9fa9a21e1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -208,7 +208,7 @@ subprojects {
                 addBooleanOption('html5', true)
                 addBooleanOption('Xdoclint:all,-missing', true)
                 links 'https://poi.apache.org/apidocs/dev/'
-                if (jdkVersion >= 23) links 'https://docs.oracle.com/en/java/javase/23/docs/api/' else links 'https://docs.oracle.com/javase/8/docs/api/'
+                if (jdkVersion >= 23) links 'https://docs.oracle.com/en/java/javase/23/docs/api/' else links 'https://docs.oracle.com/en/java/javase/11/docs/api/'
                 links 'https://xmlbeans.apache.org/docs/5.0.0/'
                 links 'https://commons.apache.org/proper/commons-compress/apidocs/'
                 use = true
diff --git a/poi-ooxml/build.gradle b/poi-ooxml/build.gradle
index f50320e02c..069691099e 100644
--- a/poi-ooxml/build.gradle
+++ b/poi-ooxml/build.gradle
@@ -216,7 +216,7 @@ javadoc {
         options {
             addBooleanOption('html5', true)
             links 'https://poi.apache.org/apidocs/dev/'
-            if (jdkVersion >= 23) links 'https://docs.oracle.com/en/java/javase/23/docs/api/' else links 'https://docs.oracle.com/javase/8/docs/api/'
+            if (jdkVersion >= 23) links 'https://docs.oracle.com/en/java/javase/23/docs/api/' else links 'https://docs.oracle.com/en/java/javase/11/docs/api/'
             use = true
             splitIndex = true
             source = "11"
diff --git a/poi/src/main/java/org/apache/poi/poifs/nio/FileBackedDataSource.java b/poi/src/main/java/org/apache/poi/poifs/nio/FileBackedDataSource.java
index b5c3050c29..6006d072c8 100644
--- a/poi/src/main/java/org/apache/poi/poifs/nio/FileBackedDataSource.java
+++ b/poi/src/main/java/org/apache/poi/poifs/nio/FileBackedDataSource.java
@@ -99,7 +99,7 @@ public class FileBackedDataSource extends DataSource implements Closeable {
         }
 
         // TODO Could we do the read-only case with MapMode.PRIVATE instead?
-        // See https://docs.oracle.com/javase/7/docs/api/java/nio/channels/FileChannel.MapMode.html#PRIVATE
+        // See https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/nio/channels/FileChannel.MapMode.html
         // Or should we have 3 modes instead of the current boolean -
         //  read-write, read-only, read-to-write-elsewhere?
 
diff --git a/src/documentation/content/xdocs/help/faq.xml b/src/documentation/content/xdocs/help/faq.xml
index 28541a1146..e82902b5fb 100644
--- a/src/documentation/content/xdocs/help/faq.xml
+++ b/src/documentation/content/xdocs/help/faq.xml
@@ -669,7 +669,7 @@ and
             Tomcat is reporting memory leaks caused by some class in Apache POI which uses ThreadLocal
         </question>
         <answer>
-            <p>Apache POI uses Java <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/ThreadLocal.html">ThreadLocals</a>
+            <p>Apache POI uses Java <a href="https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/lang/ThreadLocal.html">ThreadLocals</a>
                 in order to cache some data when Apache POI is used in a multi-threading environment (see also the FAQ about thread-safety above!)
             </p>
             <p>WebServers like Tomcat use thread-pooling to re-use threads to avoid the cost of frequent thread-startup and shutdown.