Index: build.xml
===================================================================
--- build.xml	(revision 812691)
+++ build.xml	(working copy)
@@ -375,7 +375,7 @@
   <!-- ================================================================== -->
   <!--                                                                    -->
   <!-- ================================================================== -->
-  <target name="package" depends="jar-core, javadocs, war-demo, build-contrib, init-dist">
+  <target name="package" depends="jar-core, javadocs, war-demo, build-contrib, init-dist, changes-to-html">
      <copy file="${build.demo.template}" tofile="${build.dir}/build-demo.xml">
         <filterset begintoken="@PLACEHOLDER_" endtoken="@"> 
 	  <filter token="version" value="${version}"/>
@@ -385,7 +385,7 @@
      </copy>
   </target>
 
-  <target name="nightly" depends="test, package-tgz, changes-to-html">
+  <target name="nightly" depends="test, package-tgz">
   </target>
 
   <!-- ================================================================== -->
Index: src/site/src/documentation/conf/cli.xconf
===================================================================
--- src/site/src/documentation/conf/cli.xconf	(revision 812691)
+++ src/site/src/documentation/conf/cli.xconf	(working copy)
@@ -210,8 +210,8 @@
    <exclude pattern="**apidocs**"/>
    <exclude pattern="api/**"/>
    <exclude pattern="**/api/contrib**"/>
-   <exclude pattern="**Contrib-Changes.html"/>
-
+   <exclude pattern="**changes/Contrib-Changes.html"/>
+   <exclude pattern="**changes/Changes.html"/>
 <!--
   This is a workaround for FOR-284 "link rewriting broken when
   linking to xml source views which contain site: links".
Index: src/site/src/documentation/content/xdocs/site.xml
===================================================================
--- src/site/src/documentation/content/xdocs/site.xml	(revision 812691)
+++ src/site/src/documentation/content/xdocs/site.xml	(working copy)
@@ -43,6 +43,10 @@
     <!-- keep in submenu items alpha order -->
   <docs label="Documentation">
       <overview label="Overview" href="index.html"/>
+      <changes label="Changes">
+        <changes-main label="Main" href="ext:changes-main" />
+        <changes-contrib label="Contrib" href="ext:changes-contrib" />
+      </changes>
       <javadoc label="Javadocs">
          <javadoc-all label="All" href="ext:javadocs-all"/>
 		 <javadoc-core label="Core" href="ext:javadocs-core"/>
@@ -97,6 +101,8 @@
   -->
 
   <external-refs>
+    <changes-main href="changes/Changes.html" />
+    <changes-contrib href="changes/Contrib-Changes.html" />
     <javadocs-all href="api/all/index.html"/>
 	<javadocs-core href="api/core/index.html"/>
 	<javadocs-demo href="api/demo/index.html"/>
Index: src/site/src/documentation/content/xdocs/lucene-contrib/index.xml
===================================================================
--- src/site/src/documentation/content/xdocs/lucene-contrib/index.xml	(revision 812691)
+++ src/site/src/documentation/content/xdocs/lucene-contrib/index.xml	(working copy)
@@ -41,7 +41,7 @@
 	          commitments.
 	        </p>
 			<p>
-  			  See <a href="http://lucene.apache.org/java/2_9_0/changes/Contrib-Changes.html">Contrib CHANGES</a> for changes included in the current release.
+  			  See <a href="../changes/Contrib-Changes.html">Contrib CHANGES</a> for changes included in the current release.
 			</p>