Cleanup distribution filegroup.
diff --git a/BUILD b/BUILD
index f59256b..83bec9e 100644
--- a/BUILD
+++ b/BUILD
@@ -7,8 +7,8 @@
     srcs = [
         "BUILD",
         "LICENSE",
-    ] + glob([
-        "*.bzl",
-    ]),
+        "//java:srcs",
+        "//toolchains:srcs"
+    ],
     visibility = ["@//distro:__pkg__"],
 )
diff --git a/distro/BUILD b/distro/BUILD
index 475697a..71352e8 100644
--- a/distro/BUILD
+++ b/distro/BUILD
@@ -9,10 +9,7 @@
 # Build the artifact to put on the github release page.
 pkg_tar(
     name = "rules_java-%s" % version,
-    srcs = [
-        "//:distribution",
-        "//java:distribution",
-    ],
+    srcs = ["//:distribution"],
     extension = "tar.gz",
     # It is all source code, so make it read-only.
     mode = "0444",
diff --git a/java/BUILD b/java/BUILD
index abf9526..103b99a 100644
--- a/java/BUILD
+++ b/java/BUILD
@@ -2,15 +2,12 @@
 
 licenses(["notice"])
 
-# TODO(aiuto): Find a way to strip this rule from the distribution tarball.
 filegroup(
-    name = "distribution",
+    name = "srcs",
     srcs = glob([
         "**",
     ]) + [
         "//java/constraints:srcs",
     ],
-    visibility = [
-        "@//distro:__pkg__",
-    ],
+    visibility = ["@//:__pkg__"],
 )
diff --git a/java/constraints/BUILD b/java/constraints/BUILD
index fbc5407..857ec47 100644
--- a/java/constraints/BUILD
+++ b/java/constraints/BUILD
@@ -7,6 +7,7 @@
 filegroup(
     name = "srcs",
     srcs = ["BUILD"],
+    visibility = ["@//java:__pkg__"],
 )
 
 constraint_setting(name = "runtime")
diff --git a/toolchains/BUILD b/toolchains/BUILD
index e69de29..67d2c89 100644
--- a/toolchains/BUILD
+++ b/toolchains/BUILD
@@ -0,0 +1,9 @@
+package(default_visibility = ["//visibility:public"])
+
+licenses(["notice"])
+
+filegroup(
+    name = "srcs",
+    srcs = glob(["**"]),
+    visibility = ["@//:__pkg__"],
+)