diff --git a/WORKSPACE b/WORKSPACE
index 9885aabf3c1d2a..ca3e465868629f 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -119,9 +119,9 @@ distdir_tar(
     archives = [
         "e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip",
         "f83cb8dd6f5658bc574ccd873e25197055265d1c.tar.gz",
-        "java_tools_javac11_linux-v5.0.zip",
-        "java_tools_javac11_windows-v5.0.zip",
-        "java_tools_javac11_darwin-v5.0.zip",
+        "java_tools_javac11_linux-v5.1.zip",
+        "java_tools_javac11_windows-v5.1.zip",
+        "java_tools_javac11_darwin-v5.1.zip",
         "coverage_output_generator-v2.0.zip",
         "c7bbde2950769aac9a99364b0926230060a3ce04.tar.gz",
         "8ccf4f1c351928b55d5dddf3672e3667f6978d60.tar.gz",
@@ -144,9 +144,9 @@ distdir_tar(
     sha256 = {
         "e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip": "fe2e04f91ce8c59d49d91b8102edc6627c6fa2906c1b0e7346f01419ec4f419d",
         "f83cb8dd6f5658bc574ccd873e25197055265d1c.tar.gz": "ba5d15ca230efca96320085d8e4d58da826d1f81b444ef8afccd8b23e0799b52",
-        "java_tools_javac11_linux-v5.0.zip": "b644b1eb3743376ce3aeb0cc6a15374ca5676bf872cc653c3633751c8226e060",
-        "java_tools_javac11_windows-v5.0.zip": "116fef8a385873bfda5fa76e831959aa0ad0b12ca9a880bd0fc7252413ed7c1f",
-        "java_tools_javac11_darwin-v5.0.zip": "dfa0e6b6320325eb28023ed754022d985d462b4db468394be305a82f55e7dafa",
+        "java_tools_javac11_linux-v5.1.zip": "ea2ee2f9eab37e04eae5aa8a266373132fe57676c25ea033504bc5438d6bc1ba",
+        "java_tools_javac11_windows-v5.1.zip": "b2cfebc049c349268a7ca0e5ff37160899f87f6fe6a80a789de3df90db4ce4ef",
+        "java_tools_javac11_darwin-v5.1.zip": "2fa01b4cb69e33f85a96ba0620a2e6261f789eefdbeaeb1d2879140b50108db7",
         "coverage_output_generator-v2.0.zip": "3a6951051272d51613ac4c77af6ce238a3db321bf06506fde1b8866eb18a89dd",
         "c7bbde2950769aac9a99364b0926230060a3ce04.tar.gz": "e6a76586b264f30679688f65f7e71ac112d1446681010a13bf22d9ca071f34b7",
         "8ccf4f1c351928b55d5dddf3672e3667f6978d60.tar.gz": "d868ce50d592ef4aad7dec4dd32ae68d2151261913450fac8390b3fd474bb898",
@@ -174,14 +174,14 @@ distdir_tar(
             "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/archive/f83cb8dd6f5658bc574ccd873e25197055265d1c.tar.gz",
             "https://github.com/bazelbuild/bazel-skylib/archive/f83cb8dd6f5658bc574ccd873e25197055265d1c.tar.gz",
         ],
-        "java_tools_javac11_linux-v5.0.zip": [
-            "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v5.0/java_tools_javac11_linux-v5.0.zip",
+        "java_tools_javac11_linux-v5.1.zip": [
+            "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v5.1/java_tools_javac11_linux-v5.1.zip",
         ],
-        "java_tools_javac11_windows-v5.0.zip": [
-            "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v5.0/java_tools_javac11_windows-v5.0.zip",
+        "java_tools_javac11_windows-v5.1.zip": [
+            "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v5.1/java_tools_javac11_windows-v5.1.zip",
         ],
-        "java_tools_javac11_darwin-v5.0.zip": [
-            "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v5.0/java_tools_javac11_darwin-v5.0.zip",
+        "java_tools_javac11_darwin-v5.1.zip": [
+            "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v5.1/java_tools_javac11_darwin-v5.1.zip",
         ],
         "coverage_output_generator-v2.0.zip": [
             "https://mirror.bazel.build/bazel_coverage_output_generator/releases/coverage_output_generator-v2.0.zip",
@@ -497,9 +497,9 @@ distdir_tar(
         "zulu10.2+3-jdk10.0.1-macosx_x64-allmodules.tar.gz",
         "zulu10.2+3-jdk10.0.1-win_x64-allmodules.zip",
         "jdk10-server-release-1804.tar.xz",
-        "java_tools_javac11_linux-v5.0.zip",
-        "java_tools_javac11_windows-v5.0.zip",
-        "java_tools_javac11_darwin-v5.0.zip",
+        "java_tools_javac11_linux-v5.1.zip",
+        "java_tools_javac11_windows-v5.1.zip",
+        "java_tools_javac11_darwin-v5.1.zip",
         "coverage_output_generator-v2.0.zip",
         "zulu11.2.3-jdk11.0.1-linux_x64.tar.gz",
         "zulu11.2.3-jdk11.0.1-macosx_x64.tar.gz",
@@ -528,9 +528,9 @@ distdir_tar(
         "zulu10.2+3-jdk10.0.1-macosx_x64-allmodules.tar.gz": "e669c9a897413d855b550b4e39d79614392e6fb96f494e8ef99a34297d9d85d3",
         "zulu10.2+3-jdk10.0.1-win_x64-allmodules.zip": "c39e7700a8d41794d60985df5a20352435196e78ecbc6a2b30df7be8637bffd5",
         "jdk10-server-release-1804.tar.xz": "b7098b7aaf6ee1ffd4a2d0371a0be26c5a5c87f6aebbe46fe9a92c90583a84be",
-        "java_tools_javac11_linux-v5.0.zip": "b644b1eb3743376ce3aeb0cc6a15374ca5676bf872cc653c3633751c8226e060",
-        "java_tools_javac11_windows-v5.0.zip": "116fef8a385873bfda5fa76e831959aa0ad0b12ca9a880bd0fc7252413ed7c1f",
-        "java_tools_javac11_darwin-v5.0.zip": "dfa0e6b6320325eb28023ed754022d985d462b4db468394be305a82f55e7dafa",
+        "java_tools_javac11_linux-v5.1.zip": "ea2ee2f9eab37e04eae5aa8a266373132fe57676c25ea033504bc5438d6bc1ba",
+        "java_tools_javac11_windows-v5.1.zip": "b2cfebc049c349268a7ca0e5ff37160899f87f6fe6a80a789de3df90db4ce4ef",
+        "java_tools_javac11_darwin-v5.1.zip": "2fa01b4cb69e33f85a96ba0620a2e6261f789eefdbeaeb1d2879140b50108db7",
         "coverage_output_generator-v2.0.zip": "3a6951051272d51613ac4c77af6ce238a3db321bf06506fde1b8866eb18a89dd",
         "zulu11.2.3-jdk11.0.1-linux_x64.tar.gz": "232b1c3511f0d26e92582b7c3cc363be7ac633e371854ca2f2e9f2b50eb72a75",
         "zulu11.31.15-ca-jdk11.0.3-linux_aarch64.tar.gz": "3b0d91611b1bdc4d409afcf9eab4f0e7f4ae09f88fc01bd9f2b48954882ae69b",
@@ -558,9 +558,9 @@ distdir_tar(
         "zulu10.2+3-jdk10.0.1-macosx_x64-allmodules.tar.gz": ["https://mirror.bazel.build/openjdk/azul-zulu10.2+3-jdk10.0.1/zulu10.2+3-jdk10.0.1-macosx_x64-allmodules.tar.gz"],
         "zulu10.2+3-jdk10.0.1-win_x64-allmodules.zip": ["https://mirror.bazel.build/openjdk/azul-zulu10.2+3-jdk10.0.1/zulu10.2+3-jdk10.0.1-win_x64-allmodules.zip"],
         "jdk10-server-release-1804.tar.xz": ["https://mirror.bazel.build/openjdk.linaro.org/releases/jdk10-server-release-1804.tar.xz"],
-        "java_tools_javac11_linux-v5.0.zip": ["https://mirror.bazel.build/bazel_java_tools/releases/javac11/v5.0/java_tools_javac11_linux-v5.0.zip"],
-        "java_tools_javac11_windows-v5.0.zip": ["https://mirror.bazel.build/bazel_java_tools/releases/javac11/v5.0/java_tools_javac11_windows-v5.0.zip"],
-        "java_tools_javac11_darwin-v5.0.zip": ["https://mirror.bazel.build/bazel_java_tools/releases/javac11/v5.0/java_tools_javac11_darwin-v5.0.zip"],
+        "java_tools_javac11_linux-v5.1.zip": ["https://mirror.bazel.build/bazel_java_tools/releases/javac11/v5.1/java_tools_javac11_linux-v5.1.zip"],
+        "java_tools_javac11_windows-v5.1.zip": ["https://mirror.bazel.build/bazel_java_tools/releases/javac11/v5.1/java_tools_javac11_windows-v5.1.zip"],
+        "java_tools_javac11_darwin-v5.1.zip": ["https://mirror.bazel.build/bazel_java_tools/releases/javac11/v5.1/java_tools_javac11_darwin-v5.1.zip"],
         "coverage_output_generator-v2.0.zip": ["https://mirror.bazel.build/bazel_coverage_output_generator/releases/coverage_output_generator-v2.0.zip"],
         "zulu11.2.3-jdk11.0.1-linux_x64.tar.gz": ["https://mirror.bazel.build/openjdk/azul-zulu11.2.3-jdk11.0.1/zulu11.2.3-jdk11.0.1-linux_x64.tar.gz"],
         "zulu11.2.3-jdk11.0.1-macosx_x64.tar.gz": ["https://mirror.bazel.build/openjdk/azul-zulu11.2.3-jdk11.0.1/zulu11.2.3-jdk11.0.1-macosx_x64.tar.gz"],
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/jdk.WORKSPACE b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/jdk.WORKSPACE
index 8d425ff15c8b2b..659f6a8c715563 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/jdk.WORKSPACE
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/jdk.WORKSPACE
@@ -230,30 +230,30 @@ maybe(
 maybe(
     http_archive,
     name = "remote_java_tools_linux",
-    sha256 = "b644b1eb3743376ce3aeb0cc6a15374ca5676bf872cc653c3633751c8226e060",
+    sha256 = "ea2ee2f9eab37e04eae5aa8a266373132fe57676c25ea033504bc5438d6bc1ba",
     urls = [
-        "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v5.0/java_tools_javac11_linux-v5.0.zip",
-        "https://github.com/bazelbuild/java_tools/releases/download/javac11-v5.0/java_tools_javac11_linux-v5.0.zip",
+        "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v5.1/java_tools_javac11_linux-v5.1.zip",
+        "https://github.com/bazelbuild/java_tools/releases/download/javac11-v5.1/java_tools_javac11_linux-v5.1.zip",
     ],
 )
 
 maybe(
     http_archive,
     name = "remote_java_tools_windows",
-    sha256 = "116fef8a385873bfda5fa76e831959aa0ad0b12ca9a880bd0fc7252413ed7c1f",
+    sha256 = "b2cfebc049c349268a7ca0e5ff37160899f87f6fe6a80a789de3df90db4ce4ef",
     urls = [
-        "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v5.0/java_tools_javac11_windows-v5.0.zip",
-        "https://github.com/bazelbuild/java_tools/releases/download/javac11-v5.0/java_tools_javac11_windows-v5.0.zip",
+        "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v5.1/java_tools_javac11_windows-v5.1.zip",
+        "https://github.com/bazelbuild/java_tools/releases/download/javac11-v5.1/java_tools_javac11_windows-v5.1.zip",
     ],
 )
 
 maybe(
     http_archive,
     name = "remote_java_tools_darwin",
-    sha256 = "dfa0e6b6320325eb28023ed754022d985d462b4db468394be305a82f55e7dafa",
+    sha256 = "2fa01b4cb69e33f85a96ba0620a2e6261f789eefdbeaeb1d2879140b50108db7",
     urls = [
-        "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v5.0/java_tools_javac11_darwin-v5.0.zip",
-        "https://github.com/bazelbuild/java_tools/releases/download/javac11-v5.0/java_tools_javac11_darwin-v5.0.zip",
+        "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v5.1/java_tools_javac11_darwin-v5.1.zip",
+        "https://github.com/bazelbuild/java_tools/releases/download/javac11-v5.1/java_tools_javac11_darwin-v5.1.zip",
     ],
 )