diff --git a/build.xml b/build.xml
index 74253ce6d1f..9241531145f 100644
--- a/build.xml
+++ b/build.xml
@@ -250,8 +250,8 @@
   <!-- ================================================================== -->
   <!-- Package                                                            -->
   <!-- ================================================================== -->
-  <target name="package" depends="jar,javadoc,compile-test" 
-      description="Build distribution"> 
+  <target name="package" depends="jar,javadoc,compile-test,docs" 
+      description="Build distribution; must define -Djava5.home and -Dforrest.home so can generate doc"> 
     <mkdir dir="${dist.dir}"/>
     <copy todir="${dist.dir}" includeEmptyDirs="false" flatten="true">
       <fileset dir="${build.dir}">
@@ -340,7 +340,8 @@
   <!-- ================================================================== -->
   <!-- Doc                                                                -->
   <!-- ================================================================== -->
-  <target name="docs" depends="forrest.check" description="Generate forrest-based documentation. To use, specify -Dforrest.home=&lt;base of Apache Forrest installation&gt; on the command line." if="forrest.home">
+  <target name="docs" depends="forrest.check"
+      description="Generate forrest-based documentation. To use, specify -Dforrest.home=&lt;base of Apache Forrest installation&gt; on the command line." if="forrest.home">
     <exec dir="${docs.src}" executable="${forrest.home}/bin/forrest" failonerror="true" >
       <env key="JAVA_HOME" value="${java5.home}"/>
     </exec>
@@ -349,6 +350,10 @@
     </copy>
     <style basedir="${conf.dir}" destdir="${build.docs}"
            includes="hadoop-default.xml" style="conf/configuration.xsl"/>
+    <!--Copy to $HBASE_HOME/docs ... need to check it in to persist it.-->
+    <copy todir="${docs.dir}">
+      <fileset dir="${build.docs}" />
+    </copy>
   </target>
 
   <target name="forrest.check" unless="forrest.home" depends="java5.check">