diff --git a/gerrit-common/BUILD b/gerrit-common/BUILD
index 3b326725de..b5812ade08 100644
--- a/gerrit-common/BUILD
+++ b/gerrit-common/BUILD
@@ -43,10 +43,10 @@ java_library(
     visibility = ["//visibility:public"],
     deps = [
         ":annotations",
-        "//gerrit-patch-jgit:server",
         "//gerrit-prettify:server",
         "//gerrit-reviewdb:server",
         "//java/com/google/gerrit/extensions:api",
+        "//java/org/eclipse/jgit:server",
         "//lib:guava",
         "//lib:gwtjsonrpc",
         "//lib:gwtorm",
diff --git a/gerrit-httpd/BUILD b/gerrit-httpd/BUILD
index 0f25a888aa..e6283d844e 100644
--- a/gerrit-httpd/BUILD
+++ b/gerrit-httpd/BUILD
@@ -22,7 +22,6 @@ java_library(
         "//gerrit-gwtexpui:server",
         "//gerrit-index:query_exception",
         "//gerrit-launcher:launcher",
-        "//gerrit-patch-jgit:server",
         "//gerrit-prettify:server",
         "//gerrit-reviewdb:server",
         "//gerrit-server:metrics",
@@ -31,6 +30,7 @@ java_library(
         "//gerrit-util-cli:cli",
         "//gerrit-util-http:http",
         "//java/com/google/gerrit/extensions:api",
+        "//java/org/eclipse/jgit:server",
         "//lib:args4j",
         "//lib:gson",
         "//lib:guava",
diff --git a/gerrit-plugin-gwtui/BUILD b/gerrit-plugin-gwtui/BUILD
index 9aaef31d4a..adcdae5e6e 100644
--- a/gerrit-plugin-gwtui/BUILD
+++ b/gerrit-plugin-gwtui/BUILD
@@ -23,14 +23,14 @@ java_library2(
     deps = DEPS + [
         "//gerrit-common:libclient-src.jar",
         "//java/com/google/gerrit/extensions:libclient-src.jar",
+        "//java/org/eclipse/jgit:libclient-src.jar",
+        "//java/org/eclipse/jgit:libEdit-src.jar",
         "//gerrit-gwtexpui:libClippy-src.jar",
         "//gerrit-gwtexpui:libGlobalKey-src.jar",
         "//gerrit-gwtexpui:libProgress-src.jar",
         "//gerrit-gwtexpui:libSafeHtml-src.jar",
         "//gerrit-gwtexpui:libUserAgent-src.jar",
         "//gerrit-gwtui-common:libclient-src.jar",
-        "//gerrit-patch-jgit:libclient-src.jar",
-        "//gerrit-patch-jgit:libEdit-src.jar",
         "//gerrit-prettify:libclient-src.jar",
         "//gerrit-reviewdb:libclient-src.jar",
         "//lib/gwt:dev-neverlink",
diff --git a/gerrit-prettify/BUILD b/gerrit-prettify/BUILD
index 4e39180f98..16dd7a1cab 100644
--- a/gerrit-prettify/BUILD
+++ b/gerrit-prettify/BUILD
@@ -9,10 +9,10 @@ gwt_module(
     ]),
     exported_deps = [
         "//gerrit-gwtexpui:SafeHtml",
-        "//gerrit-patch-jgit:Edit",
-        "//gerrit-patch-jgit:client",
         "//gerrit-reviewdb:client",
         "//java/com/google/gerrit/extensions:client",
+        "//java/org/eclipse/jgit:Edit",
+        "//java/org/eclipse/jgit:client",
         "//lib:gwtjsonrpc",
         "//lib:gwtjsonrpc_src",
     ],
@@ -26,8 +26,8 @@ java_library(
     srcs = glob([SRC + "common/**/*.java"]),
     visibility = ["//visibility:public"],
     deps = [
-        "//gerrit-patch-jgit:server",
         "//gerrit-reviewdb:server",
+        "//java/org/eclipse/jgit:server",
         "//lib:guava",
         "//lib:gwtjsonrpc",
         "//lib/jgit/org.eclipse.jgit:jgit",
diff --git a/gerrit-server/BUILD b/gerrit-server/BUILD
index f79b5b8992..3743e848d1 100644
--- a/gerrit-server/BUILD
+++ b/gerrit-server/BUILD
@@ -45,12 +45,12 @@ java_library(
         "//gerrit-index:index",
         "//gerrit-index:query_exception",
         "//gerrit-patch-commonsnet:commons-net",
-        "//gerrit-patch-jgit:server",
         "//gerrit-prettify:server",
         "//gerrit-reviewdb:server",
         "//gerrit-util-cli:cli",
         "//gerrit-util-ssl:ssl",
         "//java/com/google/gerrit/extensions:api",
+        "//java/org/eclipse/jgit:server",
         "//lib:args4j",
         "//lib:automaton",
         "//lib:blame-cache",
@@ -298,7 +298,7 @@ junit_tests(
         ":custom-truth-subjects",
         ":testutil",
         "//gerrit-index:query_exception",
-        "//gerrit-patch-jgit:server",
+        "//java/org/eclipse/jgit:server",
         "//java/com/google/gerrit/extensions/common/testing:common-test-util",
         "//lib:args4j",
         "//lib:grappa",
diff --git a/gerrit-sshd/BUILD b/gerrit-sshd/BUILD
index e749b41423..ddbfa8af26 100644
--- a/gerrit-sshd/BUILD
+++ b/gerrit-sshd/BUILD
@@ -11,13 +11,13 @@ java_library(
         "//gerrit-common:annotations",
         "//gerrit-common:server",
         "//gerrit-lucene:lucene",
-        "//gerrit-patch-jgit:server",
         "//gerrit-reviewdb:server",
         "//gerrit-server:metrics",
         "//gerrit-server:receive",
         "//gerrit-server:server",
         "//gerrit-util-cli:cli",
         "//java/com/google/gerrit/extensions:api",
+        "//java/org/eclipse/jgit:server",
         "//lib:args4j",
         "//lib:gson",
         "//lib:guava",
diff --git a/gerrit-patch-jgit/BUILD b/java/org/eclipse/jgit/BUILD
similarity index 57%
rename from gerrit-patch-jgit/BUILD
rename to java/org/eclipse/jgit/BUILD
index 1a8fcd4477..65bc1185b7 100644
--- a/gerrit-patch-jgit/BUILD
+++ b/java/org/eclipse/jgit/BUILD
@@ -1,15 +1,13 @@
 load("//tools/bzl:genrule2.bzl", "genrule2")
 load("//tools/bzl:gwt.bzl", "gwt_module")
 
-SRC = "src/main/java/org/eclipse/jgit/"
-
 gwt_module(
     name = "client",
     srcs = [
-        SRC + "diff/Edit_JsonSerializer.java",
-        SRC + "diff/ReplaceEdit.java",
+        "diff/Edit_JsonSerializer.java",
+        "diff/ReplaceEdit.java",
     ],
-    gwt_xml = SRC + "JGit.gwt.xml",
+    gwt_xml = "JGit.gwt.xml",
     visibility = ["//visibility:public"],
     deps = [
         ":Edit",
@@ -39,13 +37,10 @@ genrule2(
 java_library(
     name = "server",
     srcs = [
-        SRC + x
-        for x in [
-            "diff/EditDeserializer.java",
-            "diff/ReplaceEdit.java",
-            "internal/storage/file/WindowCacheStatAccessor.java",
-            "lib/ObjectIdSerialization.java",
-        ]
+        "diff/EditDeserializer.java",
+        "diff/ReplaceEdit.java",
+        "internal/storage/file/WindowCacheStatAccessor.java",
+        "lib/ObjectIdSerialization.java",
     ],
     visibility = ["//visibility:public"],
     deps = [
@@ -53,15 +48,3 @@ java_library(
         "//lib/jgit/org.eclipse.jgit:jgit",
     ],
 )
-
-java_test(
-    name = "jgit_patch_tests",
-    srcs = glob(["src/test/java/**/*.java"]),
-    test_class = "org.eclipse.jgit.diff.EditDeserializerTest",
-    visibility = ["//visibility:public"],
-    deps = [
-        ":server",
-        "//lib:junit",
-        "//lib/jgit/org.eclipse.jgit:jgit",
-    ],
-)
diff --git a/gerrit-patch-jgit/src/main/java/org/eclipse/jgit/JGit.gwt.xml b/java/org/eclipse/jgit/JGit.gwt.xml
similarity index 100%
rename from gerrit-patch-jgit/src/main/java/org/eclipse/jgit/JGit.gwt.xml
rename to java/org/eclipse/jgit/JGit.gwt.xml
diff --git a/gerrit-patch-jgit/src/main/java/org/eclipse/jgit/diff/EditDeserializer.java b/java/org/eclipse/jgit/diff/EditDeserializer.java
similarity index 100%
rename from gerrit-patch-jgit/src/main/java/org/eclipse/jgit/diff/EditDeserializer.java
rename to java/org/eclipse/jgit/diff/EditDeserializer.java
diff --git a/gerrit-patch-jgit/src/main/java/org/eclipse/jgit/diff/Edit_JsonSerializer.java b/java/org/eclipse/jgit/diff/Edit_JsonSerializer.java
similarity index 100%
rename from gerrit-patch-jgit/src/main/java/org/eclipse/jgit/diff/Edit_JsonSerializer.java
rename to java/org/eclipse/jgit/diff/Edit_JsonSerializer.java
diff --git a/gerrit-patch-jgit/src/main/java/org/eclipse/jgit/diff/ReplaceEdit.java b/java/org/eclipse/jgit/diff/ReplaceEdit.java
similarity index 100%
rename from gerrit-patch-jgit/src/main/java/org/eclipse/jgit/diff/ReplaceEdit.java
rename to java/org/eclipse/jgit/diff/ReplaceEdit.java
diff --git a/gerrit-patch-jgit/src/main/java/org/eclipse/jgit/internal/storage/file/WindowCacheStatAccessor.java b/java/org/eclipse/jgit/internal/storage/file/WindowCacheStatAccessor.java
similarity index 100%
rename from gerrit-patch-jgit/src/main/java/org/eclipse/jgit/internal/storage/file/WindowCacheStatAccessor.java
rename to java/org/eclipse/jgit/internal/storage/file/WindowCacheStatAccessor.java
diff --git a/gerrit-patch-jgit/src/main/java/org/eclipse/jgit/lib/ObjectIdSerialization.java b/java/org/eclipse/jgit/lib/ObjectIdSerialization.java
similarity index 100%
rename from gerrit-patch-jgit/src/main/java/org/eclipse/jgit/lib/ObjectIdSerialization.java
rename to java/org/eclipse/jgit/lib/ObjectIdSerialization.java
diff --git a/javatests/org/eclipse/jgit/BUILD b/javatests/org/eclipse/jgit/BUILD
new file mode 100644
index 0000000000..213c8c54b2
--- /dev/null
+++ b/javatests/org/eclipse/jgit/BUILD
@@ -0,0 +1,11 @@
+java_test(
+    name = "jgit_patch_tests",
+    srcs = glob(["**/*.java"]),
+    test_class = "org.eclipse.jgit.diff.EditDeserializerTest",
+    visibility = ["//visibility:public"],
+    deps = [
+        "//java/org/eclipse/jgit:server",
+        "//lib:junit",
+        "//lib/jgit/org.eclipse.jgit:jgit",
+    ],
+)
diff --git a/gerrit-patch-jgit/src/test/java/org/eclipse/jgit/diff/EditDeserializerTest.java b/javatests/org/eclipse/jgit/diff/EditDeserializerTest.java
similarity index 100%
rename from gerrit-patch-jgit/src/test/java/org/eclipse/jgit/diff/EditDeserializerTest.java
rename to javatests/org/eclipse/jgit/diff/EditDeserializerTest.java
diff --git a/tools/eclipse/BUILD b/tools/eclipse/BUILD
index 303c6f3f12..93e7e66d06 100644
--- a/tools/eclipse/BUILD
+++ b/tools/eclipse/BUILD
@@ -12,7 +12,6 @@ TEST_DEPS = [
     "//gerrit-gwtui:ui_tests",
     "//gerrit-httpd:httpd_tests",
     "//gerrit-index:index_tests",
-    "//gerrit-patch-jgit:jgit_patch_tests",
     "//gerrit-reviewdb:client_tests",
     "//gerrit-server:server_tests",
 ]
diff --git a/tools/eclipse/project.py b/tools/eclipse/project.py
index 12148a12a2..91d43ed074 100755
--- a/tools/eclipse/project.py
+++ b/tools/eclipse/project.py
@@ -276,7 +276,7 @@ try:
     makedirs(path.join(ROOT, gwt_working_dir))
 
   try:
-    check_call(['bazel', 'build', MAIN, GWT, '//gerrit-patch-jgit:libEdit-src.jar'])
+    check_call(['bazel', 'build', MAIN, GWT, '//java/org/eclipse/jgit:libEdit-src.jar'])
   except CalledProcessError:
     exit(1)
 except KeyboardInterrupt: