diff --git a/pom.xml b/pom.xml
index 1b4e5c92d3d..87123ce4374 100644
--- a/pom.xml
+++ b/pom.xml
@@ -688,11 +688,11 @@
               <offlineLinks>
                 <link>
                   <url>https://logging.apache.org/log4j/2.x/javadoc/log4j-api</url>
-                  <location>${maven.multiModuleProjectDirectory}/log4j-api/target/site/apidocs/</location>
+                  <location>${maven.multiModuleProjectDirectory}/log4j-api/target/reports/apidocs/</location>
                 </link>
                 <link>
                   <url>https://logging.apache.org/log4j/2.x/javadoc/log4j-core</url>
-                  <location>${maven.multiModuleProjectDirectory}/log4j-core/target/site/apidocs/</location>
+                  <location>${maven.multiModuleProjectDirectory}/log4j-core/target/reports/apidocs/</location>
                 </link>
               </offlineLinks>
             </configuration>
diff --git a/src/changelog/.2.x.x/4099_javadoc-cross-link.xml b/src/changelog/.2.x.x/4099_javadoc-cross-link.xml
new file mode 100644
index 00000000000..86e02a96a16
--- /dev/null
+++ b/src/changelog/.2.x.x/4099_javadoc-cross-link.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entry xmlns="https://logging.apache.org/xml/ns"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="
+           https://logging.apache.org/xml/ns
+           https://logging.apache.org/xml/ns/log4j-changelog-0.xsd"
+       type="fixed">
+  <issue id="4099" link="https://github.com/apache/logging-log4j2/issues/4099"/>
+  <issue id="4100" link="https://github.com/apache/logging-log4j2/pull/4100"/>
+  <description format="asciidoc">
+    Javadoc references across module boundaries (i.e., cross-references) are fixed
+  </description>
+</entry>