diff --git a/.buckconfig b/.buckconfig
index b59604991..8d2572bfd 100644
--- a/.buckconfig
+++ b/.buckconfig
@@ -1,10 +1,11 @@
 [alias]
-  jgit = //:jgit
-  jgit-servlet = //:jgit-servlet
-  jgit-archive = //:jgit-archive
-  jgit-lfs = //:jgit-lfs
-  jgit-lfs-server = //:jgit-lfs-server
+  all = //:all
+  jgit = //org.eclipse.jgit:jgit
+  jgit-archive = //org.eclipse.jgit.archive:jgit-archive
   jgit_bin = //:jgit_bin
+  jgit-lfs = //org.eclipse.jgit.lfs:jgit-lfs
+  jgit-lfs-server = //org.eclipse.jgit.lfs.server:jgit-lfs-server
+  jgit-servlet = //org.eclipse.jgit.http.server:jgit-servlet
 
 [buildfile]
   includes = //tools/default.defs
diff --git a/BUCK b/BUCK
index 22ab59291..4578e1758 100644
--- a/BUCK
+++ b/BUCK
@@ -1,78 +1,18 @@
-java_library(
-  name = 'jgit',
-  exported_deps = ['//org.eclipse.jgit:jgit'],
-  visibility = ['PUBLIC'],
+DEPS = [
+  '//org.eclipse.jgit:jgit',
+  '//org.eclipse.jgit.archive:jgit-archive',
+  '//org.eclipse.jgit.http.server:jgit-servlet',
+  '//org.eclipse.jgit.lfs:jgit-lfs',
+  '//org.eclipse.jgit.lfs.server:jgit-lfs-server',
+  '//org.eclipse.jgit.pgm:jgit',
+]
+
+zip_file(
+  name = 'all',
+  srcs = DEPS,
 )
 
-genrule(
-  name = 'jgit_src',
-  cmd = 'ln -s $(location //org.eclipse.jgit:jgit_src) $OUT',
-  out = 'jgit_src.zip',
-  visibility = ['PUBLIC'],
-)
-
-java_library(
-  name = 'jgit-servlet',
-  exported_deps = [
-    ':jgit',
-    '//org.eclipse.jgit.http.server:jgit-servlet'
-  ],
-  visibility = ['PUBLIC'],
-)
-
-java_library(
-  name = 'jgit-archive',
-  exported_deps = [
-    ':jgit',
-    '//org.eclipse.jgit.archive:jgit-archive'
-  ],
-  visibility = ['PUBLIC'],
-)
-
-java_library(
-  name = 'jgit-lfs',
-  exported_deps = [
-    ':jgit',
-    '//org.eclipse.jgit.lfs:jgit-lfs'
-  ],
-  visibility = ['PUBLIC'],
-)
-
-genrule(
-  name = 'jgit-lfs_src',
-  cmd = 'ln -s $(location //org.eclipse.jgit.lfs:jgit-lfs_src) $OUT',
-  out = 'jgit-lfs_src.zip',
-  visibility = ['PUBLIC'],
-)
-
-java_library(
-  name = 'jgit-lfs-server',
-  exported_deps = [
-    ':jgit',
-    ':jgit-lfs',
-    '//org.eclipse.jgit.lfs.server:jgit-lfs-server'
-  ],
-  visibility = ['PUBLIC'],
-)
-
-genrule(
-  name = 'jgit-lfs-server_src',
-  cmd = 'ln -s $(location //org.eclipse.jgit.lfs.server:jgit-lfs-server_src) $OUT',
-  out = 'jgit-lfs-server_src.zip',
-  visibility = ['PUBLIC'],
-)
-
-java_library(
-  name = 'junit',
-  exported_deps = [
-    ':jgit',
-    '//org.eclipse.jgit.junit:junit'
-  ],
-  visibility = ['PUBLIC'],
-)
-
-genrule(
+sh_binary(
   name = 'jgit_bin',
-  cmd = 'ln -s $(location //org.eclipse.jgit.pgm:jgit) $OUT',
-  out = 'jgit_bin',
+  main = '//org.eclipse.jgit.pgm:jgit',
 )