diff --git a/jpa/plugins/org.eclipse.jpt.doc.isv/build.properties b/jpa/plugins/org.eclipse.jpt.doc.isv/build.properties
index 6d84e6b..3932a57 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.isv/build.properties
+++ b/jpa/plugins/org.eclipse.jpt.doc.isv/build.properties
@@ -11,6 +11,7 @@
 customBuildCallbacks=customBuildCallbacks.xml
 
 bin.includes = META-INF/,\
+               jptOptions.tmp.txt,\
                plugin.xml,\
                plugin.properties,\
                about.html,\
diff --git a/jpa/plugins/org.eclipse.jpt.doc.isv/jptCommonCore.properties b/jpa/plugins/org.eclipse.jpt.doc.isv/jptCommonCore.properties
index fe6aaf7..16f36d5 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.isv/jptCommonCore.properties
+++ b/jpa/plugins/org.eclipse.jpt.doc.isv/jptCommonCore.properties
@@ -23,13 +23,13 @@
 								../org.eclipse.wst.validation/@dot;\
 								../org.eclipse.wst.xml.core/@dot
 
-common.core.packages = org.eclipse.jpt.common.core\
-								org.eclipse.jpt.common.core.gen\
-								org.eclipse.jpt.common.core.libprov\
-								org.eclipse.jpt.common.core.libval\
-								org.eclipse.jpt.common.core.resource\
-								org.eclipse.jpt.common.core.resource.java\
-								org.eclipse.jpt.common.core.resource.xml\
-								org.eclipse.jpt.common.core.utility\
-								org.eclipse.jpt.common.core.utility.command\
-								org.eclipse.jpt.common.core.utility.jdt
+common.core.packages = org.eclipse.jpt.common.core \
+								org.eclipse.jpt.common.core.gen \
+								org.eclipse.jpt.common.core.libprov \
+								org.eclipse.jpt.common.core.libval \
+								org.eclipse.jpt.common.core.resource \
+								org.eclipse.jpt.common.core.resource.java \
+								org.eclipse.jpt.common.core.resource.xml \
+								org.eclipse.jpt.common.core.utility \
+								org.eclipse.jpt.common.core.utility.command \
+								org.eclipse.jpt.common.core.utility.jdt 
diff --git a/jpa/plugins/org.eclipse.jpt.doc.isv/jptCommonUi.properties b/jpa/plugins/org.eclipse.jpt.doc.isv/jptCommonUi.properties
index c0a3d80..ef3e0c2 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.isv/jptCommonUi.properties
+++ b/jpa/plugins/org.eclipse.jpt.doc.isv/jptCommonUi.properties
@@ -16,6 +16,6 @@
 								../org.eclipse.ui.views.properties.tabbed/@dot;\
 								../org.eclipse.wst.common.project.facet.ui/@dot
 
-common.ui.packages = org.eclipse.jpt.common.ui\
-								org.eclipse.jpt.common.ui.gen\
+common.ui.packages = org.eclipse.jpt.common.ui \
+								org.eclipse.jpt.common.ui.gen \
 								org.eclipse.jpt.common.ui.jface
diff --git a/jpa/plugins/org.eclipse.jpt.doc.isv/jptCommonUtility.properties b/jpa/plugins/org.eclipse.jpt.doc.isv/jptCommonUtility.properties
index 0410c85..5c6e501 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.isv/jptCommonUtility.properties
+++ b/jpa/plugins/org.eclipse.jpt.doc.isv/jptCommonUtility.properties
@@ -1,9 +1,9 @@
 common.utility.sourcepath = ../org.eclipse.jpt.common.utility/src
 
-common.utility.packages = org.eclipse.jpt.common.utility\
-								org.eclipse.jpt.common.utility.command\
-								org.eclipse.jpt.common.utility.model\
-								org.eclipse.jpt.common.utility.model.event\
-								org.eclipse.jpt.common.utility.model.listener\
-								org.eclipse.jpt.common.utility.model.value\
-								org.eclipse.jpt.common.utility.synchronizers
+common.utility.packages = org.eclipse.jpt.common.utility \
+								org.eclipse.jpt.common.utility.command \
+								org.eclipse.jpt.common.utility.model \
+								org.eclipse.jpt.common.utility.model.event \
+								org.eclipse.jpt.common.utility.model.listener \
+								org.eclipse.jpt.common.utility.model.value \
+								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 95e2202..114756c 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.isv/jptOptions.txt
+++ b/jpa/plugins/org.eclipse.jpt.doc.isv/jptOptions.txt
@@ -2,7 +2,7 @@
 
 -quiet
 -charset "utf-8"
--sourcepath "@commonUtilitySourcepath@;@commonCoreSourcepath@";@commonUiSourcepath@"
+-sourcepath "@commonUtilitySourcepath@;@commonCoreSourcepath@;@commonUiSourcepath@"
 -classpath @rt@;@commonCoreClasspath@;@commonUiClasspath@
 -breakiterator
 -use
@@ -15,6 +15,4 @@
 -link http://docs.oracle.com/javase/6/docs/api/
 
 #JPT common API packages
-@commonUtilityPackages@
-@commonCorePackages@
-@commonUiPackages@
+@commonUtilityPackages@ @commonCorePackages@ @commonUiPackages@