diff --git a/rse/doc/org.eclipse.dstore.doc.isv/buildDoc.xml b/rse/doc/org.eclipse.dstore.doc.isv/buildDoc.xml
index f647cfe2a10..e99ebdf0196 100755
--- a/rse/doc/org.eclipse.dstore.doc.isv/buildDoc.xml
+++ b/rse/doc/org.eclipse.dstore.doc.isv/buildDoc.xml
@@ -25,7 +25,7 @@
 	<target name="getJavadocPath">
 		<available file="${java.home}/../bin/javadoc.exe" property="javadoc" value="${java.home}/../bin/javadoc.exe" />
 		<available file="${java.home}/../bin/javadoc" property="javadoc" value="${java.home}/../bin/javadoc" />
-		<available file="/usr/bin/javadoc/" property="javadoc" value="/usr/bin/javadoc" />
+		<available file="/usr/bin/javadoc" property="javadoc" value="/usr/bin/javadoc" />
 	</target>
 
 	<target name="generateJavadoc" depends="getJavadocPath" if="javadoc">
diff --git a/rse/doc/org.eclipse.dstore.doc.isv/customBuildCallbacks.xml b/rse/doc/org.eclipse.dstore.doc.isv/customBuildCallbacks.xml
index 0a814ed6696..e457715e43c 100644
--- a/rse/doc/org.eclipse.dstore.doc.isv/customBuildCallbacks.xml
+++ b/rse/doc/org.eclipse.dstore.doc.isv/customBuildCallbacks.xml
@@ -85,6 +85,16 @@
 	</target>
 	-->
 	
+	<!-- ===================================================================== -->
+	<!-- Steps to do before the target gather.bin.parts                         -->
+	<!-- Available parameters :                                                -->
+	<!--   base.dir - root of the project                                      -->
+	<!--   build.result.folder - folder containing the build results           -->
+	<!--   target.folder - destination folder                                  -->
+	<!-- ===================================================================== -->
+	<target name="pre.gather.bin.parts">
+	</target>
+	
 	<!-- ===================================================================== -->
 	<!-- Steps to do after the target gather.bin.parts                         -->
 	<!-- Available parameters :                                                -->
diff --git a/rse/doc/org.eclipse.dstore.doc.isv/plugin.xml b/rse/doc/org.eclipse.dstore.doc.isv/plugin.xml
index 7384f28c73d..f48f842b252 100755
--- a/rse/doc/org.eclipse.dstore.doc.isv/plugin.xml
+++ b/rse/doc/org.eclipse.dstore.doc.isv/plugin.xml
@@ -2,9 +2,8 @@
 <plugin>
 
    <extension point="org.eclipse.help.toc">
-   	  <toc
-            file="toc.xml"
-            primary="true"/>
+   	  <toc file="toc.xml" primary="true"/>
+   	  <index path="index"/>
    </extension>
 
 </plugin>
diff --git a/rse/doc/org.eclipse.rse.doc.isv/buildDoc.xml b/rse/doc/org.eclipse.rse.doc.isv/buildDoc.xml
index a0b62ff166c..6f654f5a621 100755
--- a/rse/doc/org.eclipse.rse.doc.isv/buildDoc.xml
+++ b/rse/doc/org.eclipse.rse.doc.isv/buildDoc.xml
@@ -26,7 +26,7 @@
 	<target name="getJavadocPath">
 		<available file="${java.home}/../bin/javadoc.exe" property="javadoc" value="${java.home}/../bin/javadoc.exe" />
 		<available file="${java.home}/../bin/javadoc" property="javadoc" value="${java.home}/../bin/javadoc" />
-		<available file="/usr/bin/javadoc/" property="javadoc" value="/usr/bin/javadoc" />
+		<available file="/usr/bin/javadoc" property="javadoc" value="/usr/bin/javadoc" />
 	</target>
 
 	<target name="generateJavadoc" depends="getJavadocPath" if="javadoc">
diff --git a/rse/doc/org.eclipse.rse.doc.isv/customBuildCallbacks.xml b/rse/doc/org.eclipse.rse.doc.isv/customBuildCallbacks.xml
index 0a814ed6696..7e14739e639 100644
--- a/rse/doc/org.eclipse.rse.doc.isv/customBuildCallbacks.xml
+++ b/rse/doc/org.eclipse.rse.doc.isv/customBuildCallbacks.xml
@@ -85,6 +85,16 @@
 	</target>
 	-->
 	
+	<!-- ===================================================================== -->
+	<!-- Steps to do before the target gather.bin.parts                         -->
+	<!-- Available parameters :                                                -->
+	<!--   base.dir - root of the project                                      -->
+	<!--   build.result.folder - folder containing the build results           -->
+	<!--   target.folder - destination folder                                  -->
+	<!-- ===================================================================== -->
+	<target name="pre.gather.bin.parts">
+
+	</target>
 	<!-- ===================================================================== -->
 	<!-- Steps to do after the target gather.bin.parts                         -->
 	<!-- Available parameters :                                                -->
diff --git a/rse/doc/org.eclipse.rse.doc.isv/plugin.xml b/rse/doc/org.eclipse.rse.doc.isv/plugin.xml
index 467ee524fe9..942a914c2a6 100755
--- a/rse/doc/org.eclipse.rse.doc.isv/plugin.xml
+++ b/rse/doc/org.eclipse.rse.doc.isv/plugin.xml
@@ -14,7 +14,7 @@
 <!-- ============================================================================= -->
 
    <extension point="org.eclipse.help.toc"> 
-       <toc file="toc.xml" primary="true" />
+       <toc file="toc.xml" primary="true"/>
        <index path="index" />
    </extension>
 
@@ -23,10 +23,10 @@
 <!-- ============================================================================= -->
 
    <extension point="org.eclipse.help.toc"> 
-       <toc file="topics_Guide.xml" />   
-       <toc file="topics_Reference.xml" />   
-       <toc file="topics_Questions.xml" />   
-       <toc file="topics_Samples.xml" />   
+       <toc file="topics_Guide.xml"/>   
+       <toc file="topics_Reference.xml"/>   
+       <toc file="topics_Questions.xml"/>   
+       <toc file="topics_Samples.xml"/>   
    </extension>
    
 <!-- ============================================================================= -->