diff --git a/.buckconfig b/.buckconfig
index 9af90e7e80..6c08697b2b 100644
--- a/.buckconfig
+++ b/.buckconfig
@@ -2,8 +2,8 @@
   api = //:api
   api_deploy = //tools/maven:deploy
   api_install = //tools/maven:install
-  download = //:download
-  download_sources = //:download_sources
+  download = //tools:download
+  download_sources = //tools:download_sources
   gerrit = //:gerrit
   eclipse = //tools/eclipse:eclipse
   eclipse_project = //tools/eclipse:eclipse_project
diff --git a/BUCK b/BUCK
index ef1d50c89f..3674370cf2 100644
--- a/BUCK
+++ b/BUCK
@@ -72,17 +72,3 @@ java_binary(
   ] + [d + '-src' for d in PLUGIN_API],
   visibility = ['//tools/maven:'],
 )
-
-genrule(
-  name = 'download',
-  cmd = '$(exe //tools:download_all)',
-  deps = ['//tools:download_all'],
-  out = '__fake.download__',
-)
-
-genrule(
-  name = 'download_sources',
-  cmd = '$(exe //tools:download_all) --src',
-  deps = ['//tools:download_all'],
-  out = '__fake.download__',
-)
diff --git a/tools/BUCK b/tools/BUCK
index 0e96f5d7de..4323ff98f2 100644
--- a/tools/BUCK
+++ b/tools/BUCK
@@ -1,7 +1,20 @@
+genrule(
+  name = 'download',
+  cmd = '$(exe :download_all)',
+  deps = [':download_all'],
+  out = '__fake.download__',
+)
+
+genrule(
+  name = 'download_sources',
+  cmd = '$(exe :download_all) --src',
+  deps = [':download_all'],
+  out = '__fake.download__',
+)
+
 python_binary(
   name = 'download_all',
   main = 'download_all.py',
-  visibility = ['PUBLIC'],
 )
 
 python_binary(