diff --git a/opendj-doc-generated-ref/src/main/ant/zip.xml b/opendj-doc-generated-ref/src/main/ant/zip.xml
index e9b9af404b..39ddb42c0c 100644
--- a/opendj-doc-generated-ref/src/main/ant/zip.xml
+++ b/opendj-doc-generated-ref/src/main/ant/zip.xml
@@ -6,6 +6,7 @@
                 <dirset dir="${basedir}/src/main/docbkx/" casesensitive="yes">
                     <include name="*/"/>
                     <exclude name="*/*/**"/>
+                    <exclude name="shared"/>
                 </dirset>
             </path>
             <mapper type="flatten"/>
diff --git a/opendj-doc-generated-ref/src/main/docbkx/admin-guide/SKIP-index.xml b/opendj-doc-generated-ref/src/main/docbkx/admin-guide/index.xml
similarity index 100%
rename from opendj-doc-generated-ref/src/main/docbkx/admin-guide/SKIP-index.xml
rename to opendj-doc-generated-ref/src/main/docbkx/admin-guide/index.xml
diff --git a/opendj-doc-generated-ref/src/main/docbkx/dev-guide/chap-controls.xml b/opendj-doc-generated-ref/src/main/docbkx/dev-guide/chap-controls.xml
index f00ca2f6fd..71682cbe51 100644
--- a/opendj-doc-generated-ref/src/main/docbkx/dev-guide/chap-controls.xml
+++ b/opendj-doc-generated-ref/src/main/docbkx/dev-guide/chap-controls.xml
@@ -1364,8 +1364,7 @@ sn: Jensen
   a <literal>GenericControl.newControl()</literal> static method to add the
   request control to your search.</para>
 
-  <programlisting language="java"
-  >[jcp:org.forgerock.opendj.examples.GetADChangeNotifications:--- JCite ---]</programlisting>
+  <filename>org.forgerock.opendj.examples.GetADChangeNotifications.java</filename>
 
   <para>When you run the search against Active Directory and then create,
   update, and delete a new user, in this example
diff --git a/opendj-doc-generated-ref/src/main/docbkx/dev-guide/SKIP-index.xml b/opendj-doc-generated-ref/src/main/docbkx/dev-guide/index.xml
similarity index 100%
rename from opendj-doc-generated-ref/src/main/docbkx/dev-guide/SKIP-index.xml
rename to opendj-doc-generated-ref/src/main/docbkx/dev-guide/index.xml
diff --git a/opendj-doc-generated-ref/src/main/docbkx/install-guide/SKIP-index.xml b/opendj-doc-generated-ref/src/main/docbkx/install-guide/index.xml
similarity index 100%
rename from opendj-doc-generated-ref/src/main/docbkx/install-guide/SKIP-index.xml
rename to opendj-doc-generated-ref/src/main/docbkx/install-guide/index.xml
diff --git a/opendj-doc-generated-ref/src/main/docbkx/release-notes/index-SKIP.xml b/opendj-doc-generated-ref/src/main/docbkx/release-notes/index.xml
similarity index 100%
rename from opendj-doc-generated-ref/src/main/docbkx/release-notes/index-SKIP.xml
rename to opendj-doc-generated-ref/src/main/docbkx/release-notes/index.xml