diff -Nru openjdk-boot.orig/jaxws/build.properties openjdk-boot/jaxws/build.properties
--- openjdk-boot.orig/jaxws/build.properties	2011-03-08 18:42:23.703875234 +0000
+++ openjdk-boot/jaxws/build.properties	2011-03-08 18:40:33.955159212 +0000
@@ -32,7 +32,8 @@
 # other tools, and product versions of all the tools.
 # Override this path as needed, either on the command line or in 
 # one of the standard user build.properties files (see build.xml)
-javac.jar=${bootstrap.dir}/lib/javac.jar
+javac.jar=${langtools.dist}/bootstrap/lib/javac.jar
+langtools.jar=${langtools.dist}/lib/classes.jar
 
 # The tools.jar is needed in the classpath to compile these sources
 jdk.home=${java.home}/..
@@ -93,8 +94,9 @@
   os.name=${os.name}${line.separator}\
   os.arch=${os.arch}${line.separator}\
   os.version=${os.version}${line.separator}\
-  bootstrap.dir=${bootstrap.dir}${line.separator}\
+  bootstrap.dir=${langtools.dist}/bootstrap${line.separator}\
   javac.jar=${javac.jar}${line.separator}\
+  langtools.jar=${langtools.jar}${line.separator}\
   javac.memoryInitialSize=${javac.memoryInitialSize}${line.separator}\
   javac.memoryMaximumSize=${javac.memoryMaximumSize}${line.separator}\
   javac.source=${javac.source}${line.separator}\
diff -Nru openjdk-boot.orig/jaxws/build.xml openjdk-boot/jaxws/build.xml
--- openjdk-boot.orig/jaxws/build.xml	2011-03-08 18:43:11.778436442 +0000
+++ openjdk-boot/jaxws/build.xml	2011-03-08 18:40:29.639288336 +0000
@@ -124,7 +124,7 @@
         <mkdir dir="${build.classes.dir}"/>
         <javac 
 	     includeAntRuntime="false" 
-	     classpath="${jaxp.classes.dir}:${build.classes.dir}:${tools.jar}"
+	     classpath="${jaxp.classes.dir}:${build.classes.dir}:${langtools.jar}"
 	     fork="true"
              destdir="${build.classes.dir}"
              memoryInitialSize="${javac.memoryInitialSize}"
diff -Nru openjdk-boot.orig/jaxws/make/Makefile openjdk-boot/jaxws/make/Makefile
--- openjdk-boot.orig/jaxws/make/Makefile	2011-03-08 18:41:00.178374622 +0000
+++ openjdk-boot/jaxws/make/Makefile	2011-03-08 18:40:14.167751211 +0000
@@ -120,7 +120,7 @@
     ANT_JAVA_HOME = JAVA_HOME=$(ALT_BOOTDIR)
     ANT_OPTIONS += -Djdk.home=$(ALT_BOOTDIR)
   endif
-  ANT_OPTIONS += -Dbootstrap.dir=$(ALT_LANGTOOLS_DIST)/bootstrap
+  ANT_OPTIONS += -Dlangtools.dist=$(ALT_LANGTOOLS_DIST)
 else
   ifdef ALT_JDK_IMPORT_PATH
     ANT_JAVA_HOME = JAVA_HOME=$(ALT_JDK_IMPORT_PATH)