diff --git a/scripts/bootstrap/compile.sh b/scripts/bootstrap/compile.sh
index 5014726..cbfb246 100755
--- a/scripts/bootstrap/compile.sh
+++ b/scripts/bootstrap/compile.sh
@@ -17,7 +17,7 @@
 # Script for building bazel from scratch without bazel
 
 PROTO_FILES=$(ls src/main/protobuf/*.proto src/main/java/com/google/devtools/build/lib/buildeventstream/proto/*.proto)
-LIBRARY_JARS=$(find third_party -name '*.jar' | grep -Fv /javac-9-dev-r3297-3.jar | grep -Fv /javac7.jar | grep -Fv JavaBuilder | grep -ve third_party/grpc/grpc.*jar | tr "\n" " ")
+LIBRARY_JARS=$(find third_party -name '*.jar' | grep -Fv /javac-9-dev-r3297-1.jar | grep -Fv /javac7.jar | grep -Fv JavaBuilder | grep -ve third_party/grpc/grpc.*jar | tr "\n" " ")
 GRPC_JAVA_VERSION=0.15.0
 GRPC_LIBRARY_JARS=$(find third_party/grpc -name '*.jar' | grep -e .*${GRPC_JAVA_VERSION}.*jar | tr "\n" " ")
 LIBRARY_JARS="${LIBRARY_JARS} ${GRPC_LIBRARY_JARS}"
diff --git a/src/create_embedded_tools.sh b/src/create_embedded_tools.sh
index f478b9f..a3f0ed7 100755
--- a/src/create_embedded_tools.sh
+++ b/src/create_embedded_tools.sh
@@ -44,7 +44,7 @@
     *JavaBuilder*_deploy.jar) OUTPUT_PATH=tools/jdk/JavaBuilder_deploy.jar ;;
     *JacocoCoverage*_deploy.jar) OUTPUT_PATH=tools/jdk/JacocoCoverage_deploy.jar ;;
     *turbine_deploy.jar) OUTPUT_PATH=tools/jdk/turbine_deploy.jar ;;
-    *javac-9-dev-r3297-3.jar) OUTPUT_PATH=third_party/java/jdk/langtools/javac-9-dev-r3297-3.jar ;;
+    *javac-9-dev-r3297-1.jar) OUTPUT_PATH=third_party/java/jdk/langtools/javac-9-dev-r3297-1.jar ;;
     *javac7.jar) OUTPUT_PATH=third_party/java/jdk/langtools/javac7.jar ;;
     *SingleJar_deploy.jar) OUTPUT_PATH=tools/jdk/SingleJar_deploy.jar ;;
     *GenClass_deploy.jar) OUTPUT_PATH=tools/jdk/GenClass_deploy.jar ;;
@@ -68,9 +68,9 @@
   chmod u+w "${PACKAGE_DIR}/${OUTPUT_PATH}"
 done
 
-if [ ! -f ${PACKAGE_DIR}/third_party/java/jdk/langtools/javac-9-dev-r3297-3.jar ]; then
+if [ ! -f ${PACKAGE_DIR}/third_party/java/jdk/langtools/javac-9-dev-r3297-1.jar ]; then
   cp ${PACKAGE_DIR}/third_party/java/jdk/langtools/javac7.jar \
-      ${PACKAGE_DIR}/third_party/java/jdk/langtools/javac-9-dev-r3297-3.jar
+      ${PACKAGE_DIR}/third_party/java/jdk/langtools/javac-9-dev-r3297-1.jar
 fi
 
 cat > "${PACKAGE_DIR}/WORKSPACE" <<EOF
diff --git a/src/test/shell/testenv.sh b/src/test/shell/testenv.sh
index 1a59e06..ec04b64 100755
--- a/src/test/shell/testenv.sh
+++ b/src/test/shell/testenv.sh
@@ -354,8 +354,8 @@
 
   copy_tools_directory
 
-  [ -e third_party/java/jdk/langtools/javac-9-dev-r3297-3.jar ] \
-    || ln -s "${langtools_path}"  third_party/java/jdk/langtools/javac-9-dev-r3297-3.jar
+  [ -e third_party/java/jdk/langtools/javac-9-dev-r3297-1.jar ] \
+    || ln -s "${langtools_path}"  third_party/java/jdk/langtools/javac-9-dev-r3297-1.jar
 
   touch WORKSPACE
 }
diff --git a/third_party/README.md b/third_party/README.md
index 9b3bf5a..05a2064 100644
--- a/third_party/README.md
+++ b/third_party/README.md
@@ -166,7 +166,7 @@
 
 ## [javac](https://github.com/google/error-prone-javac)
 
-* Version: 9-dev-r3297-3 (javac-9-dev-r3297-3.jar)
+* Version: 1.9.0-dev-r2973-2 (javac7.jar) and 1.9.0-dev-r2644-2 (javac-9-dev-r3297-1.jar)
 * License: GNU GPL v2 with Classpath exception (plus other licenses, see third_party/java/jdk/langtools/LICENSE file).
 
 ## [jarjar](https://code.google.com/p/jarjar/)
diff --git a/third_party/java/jdk/README.md b/third_party/java/jdk/README.md
index 84e59cf..96881e6 100644
--- a/third_party/java/jdk/README.md
+++ b/third_party/java/jdk/README.md
@@ -10,7 +10,7 @@
 //third_party/java/jdk/langtools.
 
 Currently Bazel supports running on a JRE 8 only because the default Java
-compiler used (//third_party/java/jdk/langtools/javac-9-dev-r3297-3.jar) is the
+compiler used (//third_party/java/jdk/langtools/javac-9-dev-r3297-1.jar) is the
 Java compiler of OpenJDK 9 compiled to run on a JRE 8. This cannot
 be built to run on a JRE 7 because of code incompatibility. Bazel's
 JavaBuilder at HEAD cannot be linked with earlier version of the
diff --git a/third_party/java/jdk/langtools/BUILD b/third_party/java/jdk/langtools/BUILD
index 579adf4..b529d2a 100644
--- a/third_party/java/jdk/langtools/BUILD
+++ b/third_party/java/jdk/langtools/BUILD
@@ -19,22 +19,22 @@
         "//conditions:default": [
             "BUILD",
             "LICENSE",
-            "javac-9-dev-r3297-3.jar",
-            "javac-9-dev-r3297-3.srcjar",
+            "javac-9-dev-r3297-1.jar",
+            "javac-9-dev-r3297-1.srcjar",
         ],
     }),
 )
 
 java_import(
     name = "javac",
-    jars = ["javac-9-dev-r3297-3.jar"],
+    jars = ["javac-9-dev-r3297-1.jar"],
 )
 
 filegroup(
     name = "javac_jar",
     srcs = select({
         "//tools/jdk:jdk7": ["javac7.jar"],
-        "//conditions:default": ["javac-9-dev-r3297-3.jar"],
+        "//conditions:default": ["javac-9-dev-r3297-1.jar"],
     }),
 )
 
diff --git a/third_party/java/jdk/langtools/javac-9-dev-r3297-3.jar b/third_party/java/jdk/langtools/javac-9-dev-r3297-1.jar
similarity index 79%
rename from third_party/java/jdk/langtools/javac-9-dev-r3297-3.jar
rename to third_party/java/jdk/langtools/javac-9-dev-r3297-1.jar
index 9f612cd..225323b 100644
--- a/third_party/java/jdk/langtools/javac-9-dev-r3297-3.jar
+++ b/third_party/java/jdk/langtools/javac-9-dev-r3297-1.jar
Binary files differ
diff --git a/third_party/java/jdk/langtools/javac-9-dev-r3297-3.srcjar b/third_party/java/jdk/langtools/javac-9-dev-r3297-1.srcjar
similarity index 88%
rename from third_party/java/jdk/langtools/javac-9-dev-r3297-3.srcjar
rename to third_party/java/jdk/langtools/javac-9-dev-r3297-1.srcjar
index 2dea0dd..61c1983 100644
--- a/third_party/java/jdk/langtools/javac-9-dev-r3297-3.srcjar
+++ b/third_party/java/jdk/langtools/javac-9-dev-r3297-1.srcjar
Binary files differ
diff --git a/third_party/java/jdk/langtools/javac.jar b/third_party/java/jdk/langtools/javac.jar
new file mode 100644
index 0000000..cdb1db2
--- /dev/null
+++ b/third_party/java/jdk/langtools/javac.jar
Binary files differ
diff --git a/third_party/java/jdk/langtools/javac.srcjar b/third_party/java/jdk/langtools/javac.srcjar
new file mode 100644
index 0000000..cab9de7
--- /dev/null
+++ b/third_party/java/jdk/langtools/javac.srcjar
Binary files differ