diff --git a/packaging/pom.xml b/packaging/pom.xml
index 0a9df2247..cc7e0f5bc 100644
--- a/packaging/pom.xml
+++ b/packaging/pom.xml
@@ -31,6 +31,18 @@
               </descriptors>
             </configuration>
           </execution>
+          <execution>
+            <id>doc</id>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+            <configuration>
+              <descriptors>
+                <descriptor>src/main/assembly/assembly-doc.xml</descriptor>
+              </descriptors>
+            </configuration>
+          </execution>
         </executions>
       </plugin>
     </plugins>
diff --git a/packaging/src/main/assembly/assembly-doc.xml b/packaging/src/main/assembly/assembly-doc.xml
new file mode 100644
index 000000000..a5865f915
--- /dev/null
+++ b/packaging/src/main/assembly/assembly-doc.xml
@@ -0,0 +1,19 @@
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1 http://maven.apache.org/xsd/assembly-1.1.1.xsd">
+  <id>doc</id>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <formats>
+    <format>zip</format>
+  </formats>
+
+  <fileSets>
+    <fileSet>
+      <directory>../site/target/site/sphinx/</directory>
+      <outputDirectory>/doc</outputDirectory>
+      <includes>
+        <include>**/*</include>
+      </includes>
+    </fileSet>
+  </fileSets>
+</assembly>
\ No newline at end of file
diff --git a/packaging/src/main/assembly/assembly.xml b/packaging/src/main/assembly/assembly.xml
index 0c141c0af..e115d6fe6 100644
--- a/packaging/src/main/assembly/assembly.xml
+++ b/packaging/src/main/assembly/assembly.xml
@@ -44,14 +44,4 @@
       <outputDirectory>/</outputDirectory>
     </file>
   </files>
-
-  <fileSets>
-    <fileSet>
-      <directory>../site/target/site/sphinx/</directory>
-      <outputDirectory>/doc</outputDirectory>
-      <includes>
-        <include>**/*</include>
-      </includes>
-    </fileSet>
-  </fileSets>
 </assembly>
\ No newline at end of file