diff --git a/src/BUILD b/src/BUILD
index 25d00a52514073..e3379c0b491bf3 100644
--- a/src/BUILD
+++ b/src/BUILD
@@ -118,7 +118,6 @@ py_binary(
 # The tools Bazel uses to compile Java.
 # TODO(#6316): Gradually remove the targets here.
 JAVA_TOOLS = [
-    "//third_party/jarjar:embedded_tools_srcs",
     "//third_party/java/jdk/langtools:test-srcs",
     "//third_party/java/proguard:embedded_tools",
     "//src/java_tools/buildjar/java/com/google/devtools/build/buildjar/jarhelper:srcs",
diff --git a/src/create_embedded_tools.py b/src/create_embedded_tools.py
index 1c47724e4746e5..d95feea02af8cf 100644
--- a/src/create_embedded_tools.py
+++ b/src/create_embedded_tools.py
@@ -34,6 +34,8 @@
     ('*tools/cpp/runfiles/generated_*',
      lambda x: 'tools/cpp/runfiles/' + os.path.basename(x)[len('generated_'):]),
     ('*JavaBuilder*_deploy.jar', lambda x: 'tools/jdk/' + os.path.basename(x)),
+    ('*jarjar_command_deploy.jar',
+     lambda x: 'tools/jdk/jarjar_command_deploy.jar'),
     ('*JacocoCoverage*_deploy.jar',
      lambda x: 'tools/jdk/JacocoCoverage_deploy.jar'),
     ('*turbine_deploy.jar', lambda x: 'tools/jdk/turbine_deploy.jar'),
diff --git a/src/java_tools/junitrunner/java/com/google/testing/coverage/BUILD b/src/java_tools/junitrunner/java/com/google/testing/coverage/BUILD
index c98c525cd4a66d..3be31af97b56e0 100644
--- a/src/java_tools/junitrunner/java/com/google/testing/coverage/BUILD
+++ b/src/java_tools/junitrunner/java/com/google/testing/coverage/BUILD
@@ -52,7 +52,7 @@ genrule(
     outs = ["JacocoCoverage_jarjar_deploy.jar"],
     cmd = "\n".join([
         "JARJAR=\"$$(mktemp -t bazel.XXXXXXXX)\"",
-        "\"$(JAVA)\" -jar \"$(location //third_party/jarjar:jarjar_bin_deploy.jar)\" process \"$(location :JacocoCoverage.jarjar)\" \"$(location :JacocoCoverage_deploy.jar)\" \"$${JARJAR}\"",
+        "\"$(JAVA)\" -jar \"$(location //third_party/jarjar:jarjar_command_deploy.jar)\" process \"$(location :JacocoCoverage.jarjar)\" \"$(location :JacocoCoverage_deploy.jar)\" \"$${JARJAR}\"",
         "\"$(JAVA)\" -jar \"$(location //src/java_tools/singlejar:SingleJar_deploy.jar)\" --normalize --sources \"$${JARJAR}\" --output \"$@\"",
         "rm -fr \"$${JARJAR}\"",
     ]),
@@ -60,7 +60,7 @@ genrule(
     toolchains = ["@bazel_tools//tools/jdk:current_host_java_runtime"],
     tools = [
         "//src/java_tools/singlejar:SingleJar_deploy.jar",
-        "//third_party/jarjar:jarjar_bin_deploy.jar",
+        "//third_party/jarjar:jarjar_command_deploy.jar",
         "@bazel_tools//tools/jdk:current_host_java_runtime",
     ],
 )
diff --git a/third_party/jarjar/BUILD b/third_party/jarjar/BUILD
index 4f4f223b08859c..bc3d075fd9f246 100644
--- a/third_party/jarjar/BUILD
+++ b/third_party/jarjar/BUILD
@@ -16,6 +16,7 @@ filegroup(
     ],
 )
 
+# jarjar_bin
 java_binary(
     name = "jarjar_command",
     srcs = glob(
diff --git a/third_party/jarjar/BUILD.tools b/third_party/jarjar/BUILD.tools
deleted file mode 100644
index 2319e6bcd590a6..00000000000000
--- a/third_party/jarjar/BUILD.tools
+++ /dev/null
@@ -1,14 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-licenses(["notice"])  # Apache 2.0
-
-java_import(
-    name = "jarjar_import",
-    jars = [":jarjar_command_deploy.jar"],
-)
-
-java_binary(
-    name = "jarjar_bin",
-    main_class = "com.tonicsystems.jarjar.Main",
-    runtime_deps = [":jarjar_import"],
-)
diff --git a/third_party/java/java_tools/README.md b/third_party/java/java_tools/README.md
index 82bd2fb18962a2..408669c11285fc 100644
--- a/third_party/java/java_tools/README.md
+++ b/third_party/java/java_tools/README.md
@@ -17,3 +17,8 @@ third_party/java/java_tools/JacocoCoverage_jarjar_deploy.jar
 third_party/java/java_tools/turbine_deploy.jar
 third_party/java/java_tools/turbine_direct_binary_deploy.jar
 third_party/java/java_tools/SingleJar_deploy.jar
+
+The following tools were built with bazel 0.21.0 at commit 019f13b64630ea7e7837a2ed8b664c4262322b1c by running:
+$ third_party/java/java_tools/update_java_tools.sh
+
+third_party/java/java_tools/jarjar_command_deploy.jar
\ No newline at end of file
diff --git a/third_party/java/java_tools/jarjar_command_deploy.jar b/third_party/java/java_tools/jarjar_command_deploy.jar
new file mode 100755
index 00000000000000..10bae8897c867c
Binary files /dev/null and b/third_party/java/java_tools/jarjar_command_deploy.jar differ
diff --git a/third_party/java/java_tools/update_java_tools.sh b/third_party/java/java_tools/update_java_tools.sh
index 1c44b217794953..c77013c3c2855f 100755
--- a/third_party/java/java_tools/update_java_tools.sh
+++ b/third_party/java/java_tools/update_java_tools.sh
@@ -15,7 +15,8 @@ declare -A tool_name_to_target=(["JavaBuilder"]="src/java_tools/buildjar:JavaBui
 ["JacocoCoverage"]="src/java_tools/junitrunner/java/com/google/testing/coverage:JacocoCoverage_jarjar_deploy.jar" \
 ["Turbine"]="src/java_tools/buildjar/java/com/google/devtools/build/java/turbine/javac:turbine_deploy.jar" \
 ["TurbineDirect"]="src/java_tools/buildjar/java/com/google/devtools/build/java/turbine:turbine_direct_binary_deploy.jar" \
-["SingleJar"]="src/java_tools/singlejar/java/com/google/devtools/build/singlejar:bazel-singlejar_deploy.jar")
+["SingleJar"]="src/java_tools/singlejar/java/com/google/devtools/build/singlejar:bazel-singlejar_deploy.jar"
+["JarJar"]="third_party/jarjar:jarjar_command_deploy.jar")
 
 usage="This script updates the checked-in jars corresponding to the tools "\
 "used by the Java rules in Bazel.
diff --git a/tools/jdk/BUILD b/tools/jdk/BUILD
index c9a32e2862a7fd..ba93881eea53ef 100644
--- a/tools/jdk/BUILD
+++ b/tools/jdk/BUILD
@@ -311,6 +311,11 @@ java_import(
     jars = [":JacocoCoverage_deploy.jar"],
 )
 
+java_import(
+    name = "JarJar",
+    jars = [":jarjar_command_deploy.jar"]
+)
+
 test_suite(
     name = "windows_tests",
     tags = [