diff --git a/pom.xml b/pom.xml
index 008af57ff2..772cda1031 100644
--- a/pom.xml
+++ b/pom.xml
@@ -288,7 +288,7 @@
       </plugin>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.0</version>
+        <version>3.1</version>
         <configuration>
           <compilerVersion>1.7</compilerVersion>
           <fork>true</fork>
diff --git a/tarball/assembly.xml b/tarball/assembly.xml
index 5d8de09df7..9bcdb3130b 100644
--- a/tarball/assembly.xml
+++ b/tarball/assembly.xml
@@ -39,6 +39,13 @@
         <include>**/*.jar</include>
       </includes>
     </fileSet>
+    <fileSet>
+      <directory>target/apidocs-all</directory>
+      <outputDirectory>javadoc</outputDirectory>
+      <includes>
+        <include>**/*.jar</include>
+      </includes>
+    </fileSet>
   </fileSets>
 </assembly>
 
diff --git a/tarball/pom.xml b/tarball/pom.xml
index b1ca0ba07e..c9fe9563dc 100644
--- a/tarball/pom.xml
+++ b/tarball/pom.xml
@@ -151,6 +151,19 @@
                   <includeArtifactIds>netty-all</includeArtifactIds>
                 </configuration>
               </execution>
+              <execution>
+                <id>copy-apidocs-all-in-one</id>
+                <phase>prepare-package</phase>
+                <goals>
+                  <goal>copy-dependencies</goal>
+                </goals>
+                <configuration>
+                  <classifier>javadoc</classifier>
+                  <outputDirectory>${project.build.directory}/apidocs-all</outputDirectory>
+                  <includeGroupIds>${project.groupId}</includeGroupIds>
+                  <includeArtifactIds>netty-all</includeArtifactIds>
+                </configuration>
+              </execution>
             </executions>
           </plugin>
           <plugin>