diff --git a/gerrit_plugin.bucklet b/gerrit_plugin.bucklet
index 5c96b71..3d686c6 100644
--- a/gerrit_plugin.bucklet
+++ b/gerrit_plugin.bucklet
@@ -109,6 +109,14 @@
     visibility = ['PUBLIC'],
   )
   if gwt_module:
+    java_library(
+      name = name + '__gwt_module',
+      srcs = [],
+      resources = list(set(srcs + resources)),
+      deps = deps,
+      provided_deps = gwt_deps,
+      visibility = ['PUBLIC'],
+    )
     prebuilt_jar(
       name = '%s-static-jar' % name,
       binary_jar = ':%s-static' % name,
@@ -126,7 +134,7 @@
       name = name + '__gwt_application',
       modules = [gwt_module],
       deps = gwt_deps,
-      module_deps = [':%s__plugin' % name],
+      module_deps = [':%s__gwt_module' % name],
       local_workers = cpu_count(),
       strict = True,
       experimental_args = GWT_COMPILER_ARGS,