diff --git a/gerrit-gwtui/BUILD b/gerrit-gwtui/BUILD
index bda9aed..3e68cf9 100644
--- a/gerrit-gwtui/BUILD
+++ b/gerrit-gwtui/BUILD
@@ -6,6 +6,7 @@
 )
 load("//tools/bzl:junit.bzl", "junit_tests")
 load("//tools/bzl:license.bzl", "license_test")
+load("//tools/bzl:java.bzl", "java_library2")
 
 gwt_genrule()
 
@@ -20,6 +21,19 @@
 
 gwt_user_agent_permutations()
 
+java_library2(
+    name = "client-lib",
+    srcs = glob(["src/main/**/*.java"]),
+    exported_deps = [":ui_module"],
+    resources = glob(["src/main/**/*"]),
+    visibility = ["//visibility:public"],
+    deps = [
+        "//gerrit-gwtui-common:client-lib",
+        "//lib/gwt:dev",
+        "//lib/gwt:user",
+    ],
+)
+
 license_test(
     name = "ui_module_license_test",
     target = ":ui_module",
diff --git a/gerrit-plugin-gwtui/BUILD b/gerrit-plugin-gwtui/BUILD
index 8cc05b6..63a9d55 100644
--- a/gerrit-plugin-gwtui/BUILD
+++ b/gerrit-plugin-gwtui/BUILD
@@ -19,7 +19,10 @@
 java_library2(
     name = "gwtui-api-lib",
     srcs = SRCS,
-    exported_deps = ["//gerrit-gwtui-common:client-lib"],
+    exported_deps = [
+        "//gerrit-gwtui:client-lib",
+        "//gerrit-gwtui-common:client-lib",
+    ],
     resources = glob(["src/main/**/*"]),
     deps = DEPS + [
         "//gerrit-common:libclient-src.jar",