diff --git a/docs/org.eclipse.jst.doc.isv/javadoc.xml b/docs/org.eclipse.jst.doc.isv/javadoc.xml
index 3e58e675de9befd915595fa88c723502355c2ccb..a01d4f9fdd96cc92beddd3ac05e1c61b49cde541 100644
--- a/docs/org.eclipse.jst.doc.isv/javadoc.xml
+++ b/docs/org.eclipse.jst.doc.isv/javadoc.xml
@@ -1,10 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <project
+	  name="javadoc"
     default="main"
     basedir=".">
 
-    <property environment="env" />
+  <!-- = = = standard properties pattern = = = -->
+  <!-- 
+      First get environment variables
+      Note to be cross-platform, "environment variables" are only appropriate for 
+      some variables, e.g. ones we set, since properties are case sensitive, even if 
+      the environment variables on your operating system are not, e.g. it will 
+      be ${env.Path} not ${env.PATH} on Windows -->
+  <property environment="env" />
+
+  <!-- 
+      Let users override standard properties, if desired.
+      If this directory/files does not exist, then it will be ignored, 
+      and defaults used.
+  -->
+    <property
+      file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties" />
+  
+
+    <!-- if not otherwise set externally, assign some reasonable default, especially 
+    to work on production build machine -->
+    <property
+        name="JAVADOC_COMMAND"
+        value="${env.JAVA_5_HOME}/bin/javadoc" />
+    <property
+      name="JAVADOC_ARGS"
+      value="-J-Xms256m -J-Xmx1024m" />
 
     <property file="javadoc.properties" />
     <property
diff --git a/docs/org.eclipse.wst.doc.isv/javadoc.xml b/docs/org.eclipse.wst.doc.isv/javadoc.xml
index 0820a18ae6de278c3fa50557b53f7d240766b847..c4fbbcac73106796afa366e89a56896ee1b06240 100644
--- a/docs/org.eclipse.wst.doc.isv/javadoc.xml
+++ b/docs/org.eclipse.wst.doc.isv/javadoc.xml
@@ -1,11 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <project
+	  name="javadoc"
     default="main"
     basedir=".">
 
-    <property environment="env" />
+  <!-- = = = standard properties pattern = = = -->
+  <!-- 
+      First get environment variables
+      Note to be cross-platform, "environment variables" are only appropriate for 
+      some variables, e.g. ones we set, since properties are case sensitive, even if 
+      the environment variables on your operating system are not, e.g. it will 
+      be ${env.Path} not ${env.PATH} on Windows -->
+  <property environment="env" />
 
+  <!-- 
+      Let users override standard properties, if desired.
+      If this directory/files does not exist, then it will be ignored, 
+      and defaults used.
+  -->
+    <property
+      file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties" />
+	
+
+	  <!-- if not otherwise set externally, assign some reasonable default, especially 
+	  to work on production build machine -->
+    <property
+        name="JAVADOC_COMMAND"
+        value="${env.JAVA_5_HOME}/bin/javadoc" />
+    <property
+      name="JAVADOC_ARGS"
+      value="-J-Xms256m -J-Xmx1024m" />
+	
+	
     <property file="javadoc.properties" />
     <property
         name="outputDir"