diff --git a/distribution/pom.xml b/distribution/pom.xml
index e1304aeae..1680955a6 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -145,6 +145,7 @@
                         </group>
                     </groups>
                     <additionalOptions>${javadoc.additional.options}</additionalOptions>
+                    <outputDirectory>${project.reporting.outputDirectory}/javadocs</outputDirectory>
                 </configuration>
                 <executions>
                     <execution>
diff --git a/distribution/src/main/assembly/dist.xml b/distribution/src/main/assembly/dist.xml
index 845e646d1..a59c72c65 100644
--- a/distribution/src/main/assembly/dist.xml
+++ b/distribution/src/main/assembly/dist.xml
@@ -118,7 +118,7 @@
 
         <!-- Include documentation -->
         <fileSet>
-            <directory>target/site/apidocs</directory>
+            <directory>target/site/javadocs/apidocs</directory>
             <outputDirectory>docs/api</outputDirectory>
         </fileSet>
         <fileSet>