diff --git a/jpa/plugins/org.eclipse.jpt.doc.isv/build.properties b/jpa/plugins/org.eclipse.jpt.doc.isv/build.properties
index 3932a57..b331641 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.isv/build.properties
+++ b/jpa/plugins/org.eclipse.jpt.doc.isv/build.properties
@@ -11,7 +11,8 @@
 customBuildCallbacks=customBuildCallbacks.xml
 
 bin.includes = META-INF/,\
-               jptOptions.tmp.txt,\
+                 doc.bin.log,\
+                 jptOptions.tmp.txt,\
                plugin.xml,\
                plugin.properties,\
                about.html,\
diff --git a/jpa/plugins/org.eclipse.jpt.doc.isv/buildDoc.xml b/jpa/plugins/org.eclipse.jpt.doc.isv/buildDoc.xml
index 4761a26..9a1183f 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.isv/buildDoc.xml
+++ b/jpa/plugins/org.eclipse.jpt.doc.isv/buildDoc.xml
@@ -34,20 +34,36 @@
 
 
 	<target name="generateJavadoc" depends="getJavadocPath" if="javadoc">
-
+		<echo message="java.home = ${java.home}" />
+		<echo message="base.install.dir = ${base.install.dir}" />
+		
 		<property name="optionsFile" value="jptOptions.tmp.txt" />
 		<copy file="jptOptions.txt" tofile="${optionsFile}" overwrite="true" />
 		
-		<condition property="argsListDelimiter" value=":">
+		<condition property="pathSeparator" value=":">
 			<os family="unix" />
 		</condition>
-		<condition property="argsListDelimiter" value=";">
+		<condition property="pathSeparator" value=";">
 			<os family="windows" />
 		</condition>
 
-		<replace file="${basedir}/${optionsFile}" token="@rt@" value="${bootclasspath}" />
+		<fileset id="jreJars" dir="${java.home}/lib">
+		    <include name="*.jar" />
+		</fileset>
+		<pathconvert pathsep="${pathSeparator}" property="jreClasspath" refid="jreJars"/>
 
-		<antcall target="replaceJptCommonUtility" />
+		<replace file="${basedir}/${optionsFile}" token="@rt@" value="${jreClasspath}" /> 
+
+		<fileset id="wtpJars" dir="${base.install.dir}">
+		    <include name="*.jar" />
+		</fileset>
+		<pathconvert pathsep="${pathSeparator}" property="wtpClasspath" refid="wtpJars"/>
+
+		<replace file="${basedir}/${optionsFile}" token="@wtprt@" value="${wtpClasspath}" />
+
+        <antcall target="replacePackageTokens">
+            <param name="packageName" value="jpt.common.utility" />
+        </antcall>
         <antcall target="replacePackageTokens">
             <param name="packageName" value="jpt.common.core" />
         </antcall>
@@ -55,15 +71,7 @@
             <param name="packageName" value="jpt.common.ui" />
         </antcall>
 
-		<replaceregexp file="${basedir}/${optionsFile}" flags="g" match=";" replace="${argsListDelimiter}" />
-
-<!--
-		<antcall target="replaceJptCommonCore" />
-		<antcall target="replaceJptCommonUi" />
-		
-		<property name="commonCoreSourcepath" file="commonCoreSourcepath.txt" />
-		<replace file="${basedir}/${optionsFile}" token="@commonCoreSourcepath@" value="${commonCoreSourcepath}" />
--->
+		<replaceregexp file="${basedir}/${optionsFile}" flags="g" match=";" replace="${pathSeparator}" />
 
 		<!--scrub isv plugin directories of any preexisting doc content-->
 		<delete dir="index-files"/>
@@ -77,6 +85,7 @@
 
 	<!-- replacePackageTokens -->
 	<target name="replacePackageTokens" if="optionsFile">
+		<echo message="${packageName}" />
 		<replace 
 			file="${basedir}/${optionsFile}" 
 			propertyfile="${basedir}/${packageName}.properties">
diff --git a/jpa/plugins/org.eclipse.jpt.doc.isv/jpt.common.ui.properties b/jpa/plugins/org.eclipse.jpt.doc.isv/jpt.common.ui.properties
index 72cacd8..19c40b9 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.isv/jpt.common.ui.properties
+++ b/jpa/plugins/org.eclipse.jpt.doc.isv/jpt.common.ui.properties
@@ -1,6 +1,6 @@
 jpt.common.ui.sourcepath = ../org.eclipse.jpt.common.ui/src
 
-jpt.common.ui.classpath = 	../org.eclipse.jpt.common.core/@dot;\
+jpt.common.ui.classpath = ../org.eclipse.jpt.common.core/@dot;\
 								../org.eclipse.jpt.common.utility/@dot
 
 jpt.common.ui.packages = org.eclipse.jpt.common.ui\n\
diff --git a/jpa/plugins/org.eclipse.jpt.doc.isv/jpt.common.utility.properties b/jpa/plugins/org.eclipse.jpt.doc.isv/jpt.common.utility.properties
new file mode 100644
index 0000000..f8307a1
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.doc.isv/jpt.common.utility.properties
@@ -0,0 +1,11 @@
+jpt.common.utility.sourcepath = ../org.eclipse.jpt.common.utility/src
+
+jpt.common.utility.classpath = 
+
+jpt.common.utility.packages = org.eclipse.jpt.common.utility\n\
+								org.eclipse.jpt.common.utility.command\n\
+								org.eclipse.jpt.common.utility.model\n\
+								org.eclipse.jpt.common.utility.model.event\n\
+								org.eclipse.jpt.common.utility.model.listener\n\
+								org.eclipse.jpt.common.utility.model.value\n\
+								org.eclipse.jpt.common.utility.synchronizers
diff --git a/jpa/plugins/org.eclipse.jpt.doc.isv/jptOptions.txt b/jpa/plugins/org.eclipse.jpt.doc.isv/jptOptions.txt
index c99208c..605b832 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.isv/jptOptions.txt
+++ b/jpa/plugins/org.eclipse.jpt.doc.isv/jptOptions.txt
@@ -1,6 +1,6 @@
 -charset "utf-8"
--sourcepath "@commonUtilitySourcepath@;@jpt.common.core.sourcepath@;@jpt.common.ui.sourcepath@"
--classpath @jpt.common.core.classpath@;@jpt.common.ui.classpath@
+-sourcepath "@jpt.common.utility.sourcepath@;@jpt.common.core.sourcepath@;@jpt.common.ui.sourcepath@"
+-classpath @rt@;@jpt.common.core.classpath@;@jpt.common.ui.classpath@;@wtprt@
 -breakiterator
 -use
 -splitIndex
@@ -12,6 +12,6 @@
 -link http://docs.oracle.com/javase/6/docs/api/
 
 #JPT common API packages
-@commonUtilityPackages@
+@jpt.common.utility.packages@
 @jpt.common.core.packages@
 @jpt.common.ui.packages@