diff --git a/rse/doc/org.eclipse.dstore.doc.isv/buildDoc.xml b/rse/doc/org.eclipse.dstore.doc.isv/buildDoc.xml
index aee9d3d9363..460e5bf3529 100755
--- a/rse/doc/org.eclipse.dstore.doc.isv/buildDoc.xml
+++ b/rse/doc/org.eclipse.dstore.doc.isv/buildDoc.xml
@@ -51,7 +51,7 @@
 			</path>
 		</pathconvert>
 		<echo level="info" message="Done computing classpath."/>
-		<echo level="debug" message="Bootclasspath is: ${bootclasspath}"/>
+		<echo level="info" message="Bootclasspath is: ${bootclasspath}"/>
 		<echo level="debug" message="Classpath is: ${javadoc.classpath}"/>
 	</target>
 
@@ -109,7 +109,8 @@
 		</condition>
 
 		<replaceregexp file="${basedir}/${optionsFile}" flags="g" match="(\r\n?|\n);" replace="${argsListDelimiter}" />
-		<replace file="${basedir}/${optionsFile}" token="@rt@" value="${bootclasspath}${argsListDelimiter}${javadoc.classpath}" />
+		<replace file="${basedir}/${optionsFile}" token="@rt@" value="${bootclasspath}" />
+		<replace file="${basedir}/${optionsFile}" token="@cp@" value="${javadoc.classpath}" />
 		<replace file="${basedir}/${optionsFile}" token="@baseLocation@" value="${safeBaseLocation}" />
 		<replace file="${basedir}/${optionsFile}" token="@javadoc.link.location@" value="${javadoc.link.location}" />
 
diff --git a/rse/doc/org.eclipse.dstore.doc.isv/options.txt b/rse/doc/org.eclipse.dstore.doc.isv/options.txt
index 3ca92ddb3cd..9ef27b1553c 100755
--- a/rse/doc/org.eclipse.dstore.doc.isv/options.txt
+++ b/rse/doc/org.eclipse.dstore.doc.isv/options.txt
@@ -3,7 +3,8 @@
 -sourcepath "../org.eclipse.dstore.core/src
 ;../org.eclipse.dstore.extra/src"
 -d reference/api
--classpath @rt@
+-bootclasspath @rt@
+-classpath @cp@
 -breakiterator
 -use
 -splitIndex
diff --git a/rse/doc/org.eclipse.rse.doc.isv/buildDoc.xml b/rse/doc/org.eclipse.rse.doc.isv/buildDoc.xml
index 1737d8a148c..0553ca49df3 100755
--- a/rse/doc/org.eclipse.rse.doc.isv/buildDoc.xml
+++ b/rse/doc/org.eclipse.rse.doc.isv/buildDoc.xml
@@ -122,7 +122,8 @@
 		</condition>
 
 		<replaceregexp file="${basedir}/${optionsFile}" flags="g" match="(\r\n?|\n);" replace="${argsListDelimiter}" />
-		<replace file="${basedir}/${optionsFile}" token="@rt@" value="${bootclasspath}${argsListDelimiter}${javadoc.classpath}" />
+		<replace file="${basedir}/${optionsFile}" token="@rt@" value="${bootclasspath}" />
+		<replace file="${basedir}/${optionsFile}" token="@cp@" value="${javadoc.classpath}" />
 		<replace file="${basedir}/${optionsFile}" token="@baseLocation@" value="${safeBaseLocation}" />
 		<replace file="${basedir}/${optionsFile}" token="@javadoc.link.location@" value="${javadoc.link.location}" />
 
diff --git a/rse/doc/org.eclipse.rse.doc.isv/options.txt b/rse/doc/org.eclipse.rse.doc.isv/options.txt
index 5dd813e9904..9fad7447fdb 100755
--- a/rse/doc/org.eclipse.rse.doc.isv/options.txt
+++ b/rse/doc/org.eclipse.rse.doc.isv/options.txt
@@ -31,7 +31,8 @@
 ;../org.eclipse.rse.ui/subsystems
 ;../org.eclipse.rse.ui/systems"
 -d reference/api
--classpath @rt@
+-bootclasspath @rt@
+-classpath @cp@
 ;../org.eclipse.dstore.core/@dot
 ;../org.eclipse.dstore.core/bin
 ;../org.eclipse.dstore.extra/@dot