diff --git a/jaxp/build-defs.xml b/jaxp/build-defs.xml
index 01febd871a2..a20d94791db 100644
--- a/jaxp/build-defs.xml
+++ b/jaxp/build-defs.xml
@@ -58,6 +58,14 @@
 
     <!-- Special build area preparation. -->
     <target name="-drop-build-prep" depends="init, -init-src-dirs">
+        <mkdir dir="${build.classes.dir}"/>
+        <copy todir="${build.classes.dir}">
+            <fileset dir="${primary.src.dir}"
+                     includes="**/*.properties"/>
+        </copy>
+        <replaceregexp match="#(.*)$" replace="#" flags="gm">
+            <fileset dir="${build.classes.dir}" includes="**/*.properties"/>
+        </replaceregexp>
     </target>
 
     <!-- Try to get drop sources, set property use.orig.src.dir if no drops. -->
diff --git a/jaxp/jaxp.properties b/jaxp/jaxp.properties
index fb12c2461fd..de30baa92d4 100644
--- a/jaxp/jaxp.properties
+++ b/jaxp/jaxp.properties
@@ -26,7 +26,7 @@
 drops.master.copy.base=${devtools}/share/jdk7-drops
 drops.master.url.base=http://kenai.com/projects/jdk7-drops/downloads/download
 
-jaxp_src.bundle.name=jdk7-jaxp-2009_08_28.zip
+jaxp_src.bundle.name=jdk7-jaxp-2009_09_28.zip
 jaxp_src.master.bundle.dir=${drops.master.copy.base}
 #jaxp_src.bundle.url.base=https://jaxp.dev.java.net/files/documents/913/142147
 jaxp_src.master.bundle.url.base=${drops.master.url.base}