diff --git a/doc/org.eclipse.emf.validation.doc/META-INF/MANIFEST.MF b/doc/org.eclipse.emf.validation.doc/META-INF/MANIFEST.MF
index fc2cf9c..1c1a589 100644
--- a/doc/org.eclipse.emf.validation.doc/META-INF/MANIFEST.MF
+++ b/doc/org.eclipse.emf.validation.doc/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Plugin.name
 Bundle-SymbolicName: org.eclipse.emf.validation.doc;singleton:=true
-Bundle-Version: 1.5.0.qualifier
+Bundle-Version: 1.6.0.qualifier
 Bundle-Vendor: %Provider.name
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.help;bundle-version="[3.2.0,4.0.0)"
diff --git a/doc/org.eclipse.emf.validation.doc/build.properties b/doc/org.eclipse.emf.validation.doc/build.properties
index 2e52d6a..7057446 100644
--- a/doc/org.eclipse.emf.validation.doc/build.properties
+++ b/doc/org.eclipse.emf.validation.doc/build.properties
@@ -18,6 +18,9 @@ bin.includes = META-INF/,\
                about.properties,\
                modeling32.png,\
                plugin.xml,\
-               plugin.properties
+               plugin.properties,\
+               references/,\
+               tutorials/,\
+               toc.xml
 src.includes = about.html
 custom = true
diff --git a/doc/org.eclipse.emf.validation.doc/plugin.xml b/doc/org.eclipse.emf.validation.doc/plugin.xml
index 4502c7f..3524dc2 100644
--- a/doc/org.eclipse.emf.validation.doc/plugin.xml
+++ b/doc/org.eclipse.emf.validation.doc/plugin.xml
@@ -1,34 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.0"?>
 <plugin>
-
-   <extension
-         point="org.eclipse.help.toc">
-      <toc
-            file="toc.xml"
-            primary="true"
-            category="org.eclipse.emf.qtv"/>
-   </extension>
-
- <!-- ============================= -->
- <!-- Define TOCs                   -->
- <!-- ============================= -->
-
- <extension point="org.eclipse.help.toc">
-   <toc file="topics_Reference.xml" />
- </extension>
-
- <!-- ============================= -->
- <!-- Define Javadoc locations      -->
- <!-- ============================= -->
-<!--
-  <extension point="org.eclipse.pde.core.javadoc">
-      <javadoc path="references/javadoc">
-          <plugin id="org.eclipse.emf.validation"/>
-          <plugin id="org.eclipse.emf.validation.ocl"/>
-          <plugin id="org.eclipse.emf.validation.ui"/>
-          <plugin id="org.eclipse.emf.validation.ui.ide"/>
-      </javadoc>
-    </extension>
--->
+  <extension point="org.eclipse.help.toc">
+    <toc file="toc.xml" primary="true" category="org.eclipse.emf.qtv"/>
+  </extension>
 </plugin>
diff --git a/doc/org.eclipse.emf.validation.doc/pom.xml b/doc/org.eclipse.emf.validation.doc/pom.xml
index 0670f9c..5d2e9af 100644
--- a/doc/org.eclipse.emf.validation.doc/pom.xml
+++ b/doc/org.eclipse.emf.validation.doc/pom.xml
@@ -10,6 +10,6 @@
   </parent>
   <groupId>org.eclipse.emf.validation.plugins</groupId>
   <artifactId>org.eclipse.emf.validation.doc</artifactId>
-  <version>1.5.0-SNAPSHOT</version>
+  <version>1.6.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/doc/org.eclipse.emf.validation.doc/topics_Reference.xml b/doc/org.eclipse.emf.validation.doc/topics_Reference.xml
deleted file mode 100644
index 122dd11..0000000
--- a/doc/org.eclipse.emf.validation.doc/topics_Reference.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-
-<!-- This file is just a placeholder to avoid plugin.xml warnings -->
-<toc label="API Reference">
-	<topic label="Validation API Reference" href="references/javadoc/dummy.html"/>
-</toc>