diff --git a/third_party/README.md b/third_party/README.md
index d14d1841345b53..41768fd50d273f 100644
--- a/third_party/README.md
+++ b/third_party/README.md
@@ -166,7 +166,7 @@ a minimal set of extra dependencies.
 
 ## [javac](https://github.com/google/error-prone-javac)
 
-* Version: 9-dev-r4023-1 (javac-9-dev-r4023-1.jar)
+* Version: 9-dev-r4023-2 (javac-9-dev-r4023-2.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 032acfb83974c4..74c0762e5f8960 100644
--- a/third_party/java/jdk/README.md
+++ b/third_party/java/jdk/README.md
@@ -10,7 +10,7 @@ version of the JRE. Those builds are vendored in
 //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-4.jar) is the
+compiler used (//third_party/java/jdk/langtools/javac-9-dev-r4023-2.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 f0f57c20fdcec8..94eb08099bab53 100644
--- a/third_party/java/jdk/langtools/BUILD
+++ b/third_party/java/jdk/langtools/BUILD
@@ -19,40 +19,40 @@ filegroup(
         "//conditions:default": [
             "BUILD",
             "LICENSE",
-            "javac-9-dev-r4023-1.jar",
-            "javac-9-dev-r4023-1.srcjar",
+            "javac-9-dev-r4023-2.jar",
+            "javac-9-dev-r4023-2.srcjar",
         ],
     }),
 )
 
 java_import(
     name = "javac",
-    jars = ["javac-9-dev-r4023-1.jar"],
+    jars = ["javac-9-dev-r4023-2.jar"],
 )
 
 filegroup(
     name = "javac_jar",
     srcs = select({
         "//tools/jdk:jdk7": ["javac7.jar"],
-        "//conditions:default": ["javac-9-dev-r4023-1.jar"],
+        "//conditions:default": ["javac-9-dev-r4023-2.jar"],
     }),
 )
 
 # TODO(cushon): delete
 alias(
-    name = "test-srcs-9-dev-r4023-1",
+    name = "test-srcs-9-dev-r4023-2",
     actual = ":test-srcs",
 )
 
 # TODO(cushon): delete
 alias(
-    name = "javac-9-dev-r4023-1",
+    name = "javac-9-dev-r4023-2",
     actual = ":javac",
 )
 
 # TODO(cushon): delete
 alias(
-    name = "javac_jar-9-dev-r4023-1",
+    name = "javac_jar-9-dev-r4023-2",
     actual = ":javac_jar",
 )
 
diff --git a/third_party/java/jdk/langtools/javac-9-dev-r4023-1.jar b/third_party/java/jdk/langtools/javac-9-dev-r4023-2.jar
similarity index 95%
rename from third_party/java/jdk/langtools/javac-9-dev-r4023-1.jar
rename to third_party/java/jdk/langtools/javac-9-dev-r4023-2.jar
index 3547e81a8b85a2..65a195d6b194a4 100644
Binary files a/third_party/java/jdk/langtools/javac-9-dev-r4023-1.jar and b/third_party/java/jdk/langtools/javac-9-dev-r4023-2.jar differ
diff --git a/third_party/java/jdk/langtools/javac-9-dev-r4023-1.srcjar b/third_party/java/jdk/langtools/javac-9-dev-r4023-2.srcjar
similarity index 99%
rename from third_party/java/jdk/langtools/javac-9-dev-r4023-1.srcjar
rename to third_party/java/jdk/langtools/javac-9-dev-r4023-2.srcjar
index 6c17b89b7148c3..da27481622daa0 100644
Binary files a/third_party/java/jdk/langtools/javac-9-dev-r4023-1.srcjar and b/third_party/java/jdk/langtools/javac-9-dev-r4023-2.srcjar differ