diff --git a/hbase-assembly/src/assembly/all.xml b/hbase-assembly/src/assembly/all.xml
index f70478e4a3b..89bd028679d 100644
--- a/hbase-assembly/src/assembly/all.xml
+++ b/hbase-assembly/src/assembly/all.xml
@@ -73,14 +73,6 @@
       <directoryMode>0755</directoryMode>
     </fileSet>
 
-    <!-- Move the site to docs -->
-    <fileSet>
-      <directory>${parent.basedir}/hbase-server/target/site</directory>
-      <outputDirectory>docs</outputDirectory>
-      <fileMode>0644</fileMode>
-      <directoryMode>0644</directoryMode>
-    </fileSet>
-
     <!-- Move update script to sbin -->
     <fileSet>
       <directory>src/packages</directory>
diff --git a/hbase-server/src/main/resources/hbase-webapps/static/hbase_logo_med.gif b/hbase-server/src/main/resources/hbase-webapps/static/hbase_logo_med.gif
new file mode 100644
index 00000000000..36d3e3c9127
Binary files /dev/null and b/hbase-server/src/main/resources/hbase-webapps/static/hbase_logo_med.gif differ
diff --git a/hbase-server/src/test/data/hbase-4388-root.dir.tgz b/hbase-server/src/test/data/hbase-4388-root.dir.tgz
new file mode 100644
index 00000000000..da2244e8097
Binary files /dev/null and b/hbase-server/src/test/data/hbase-4388-root.dir.tgz differ
diff --git a/hbase-server/src/test/resources/org/apache/hadoop/hbase/io/hfile/8e8ab58dcf39412da19833fcd8f687ac b/hbase-server/src/test/resources/org/apache/hadoop/hbase/io/hfile/8e8ab58dcf39412da19833fcd8f687ac
new file mode 100644
index 00000000000..cc260fb2e05
Binary files /dev/null and b/hbase-server/src/test/resources/org/apache/hadoop/hbase/io/hfile/8e8ab58dcf39412da19833fcd8f687ac differ
diff --git a/hbase-site/pom.xml b/hbase-site/pom.xml
index 6e300e25e8e..d0c64ef337b 100644
--- a/hbase-site/pom.xml
+++ b/hbase-site/pom.xml
@@ -41,15 +41,31 @@
   </dependencies>
 
   <build>
-    <plugins>
-      <!-- Website/Reference Guide building -->
+      <plugins>
+      <!-- Assemble the javadocs from the dependent projects.
+         Relies on the use of javadoc:aggregate goal -->
       <plugin>
-        <artifactId>maven-site-plugin</artifactId>
-        <configuration>
-          <inputEncoding>UTF-8</inputEncoding>
-          <outputEncoding>UTF-8</outputEncoding>
-          <templateFile>src/site/site.vm</templateFile>
-        </configuration>
+        <artifactId>maven-resources-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>copy-javadocs</id>
+            <phase>pre-site</phase>
+            <goals>
+              <goal>copy-resources</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>target/site/apidocs</outputDirectory>
+              <resources>
+                <resource>
+                  <directory>../target/apidocs</directory>
+                  <includes>
+                    <include>**/**</include>
+                  </includes>
+                </resource>
+              </resources>
+            </configuration>
+          </execution>
+        </executions>
       </plugin>
       <!-- This has to come before the docbx plugin so hbase-default.xml gets transformed 
         properly -->
@@ -125,6 +141,15 @@
           </execution>
         </executions>
       </plugin>
+      <!-- Website/Reference Guide building -->
+      <plugin>
+        <artifactId>maven-site-plugin</artifactId>
+        <configuration>
+          <inputEncoding>UTF-8</inputEncoding>
+          <outputEncoding>UTF-8</outputEncoding>
+          <templateFile>src/site/site.vm</templateFile>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/pom.xml b/pom.xml
index d48c386b72b..215cf921efe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -339,9 +339,6 @@
   </pluginRepositories>
 
   <build>
-    <!-- Some plugins (for example) can be used in the normal build- and the site phase.
-         These plugins inherit their options from the <reporting> section below. These settings
-         can be overwritten here. -->
     <pluginManagement>
       <plugins>
         <plugin>
@@ -352,8 +349,7 @@
             <execution>
               <id>javadoc</id>
               <goals>
-                <goal>javadoc</goal>
-                <goal>test-javadoc</goal>
+                <goal>aggregate</goal>
               </goals>
               <phase>pre-site</phase>
             </execution>
@@ -647,28 +643,6 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
       </plugin>
-      <!-- All submodules move their javadocs to the apidocs directory -->
-      <plugin>
-        <artifactId>maven-resources-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>copy-javadocs</id>
-            <!-- fetch the  before creating site documentation -->
-            <phase>pre-site</phase>
-            <goals>
-              <goal>copy-resources</goal>
-            </goals>
-            <configuration>
-              <outputDirectory>${javadoc.output.dir}</outputDirectory>
-              <resources>
-                <resource>
-                  <directory>target/apidocs</directory>
-                </resource>
-              </resources>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
       <!-- Ignore running the assembly in the top-level.
        That's all handled by hbase-assembly -->
       <plugin>
@@ -733,8 +707,6 @@
     <package.pid.dir>/var/run/hbase</package.pid.dir>
     <package.release>1</package.release>
     <final.name>${project.artifactId}-${project.version}</final.name>
-    <!-- Dependency on projects all being at hbase/{project} -->
-    <javadoc.output.dir>../hbase-documentation/target/site/apidocs</javadoc.output.dir>
     
     <!-- Intraproject jar naming properties -->
     <!-- TODO this is pretty ugly, but works for the moment.