diff --git a/gerrit-extension-api/BUCK b/gerrit-extension-api/BUCK
index aad79d7adb..0c1b6a8f5b 100644
--- a/gerrit-extension-api/BUCK
+++ b/gerrit-extension-api/BUCK
@@ -47,7 +47,7 @@ java_sources(
 java_doc(
   name = 'extension-api-javadoc',
   title = 'Gerrit Review Extension API Documentation',
-  pkg = 'com.google.gerrit.extensions',
+  pkgs = ['com.google.gerrit.extensions'],
   paths = ['src/main/java'],
   srcs = SRCS,
   deps = [
diff --git a/gerrit-plugin-api/BUCK b/gerrit-plugin-api/BUCK
index 7147b1ca88..80ab9a39c5 100644
--- a/gerrit-plugin-api/BUCK
+++ b/gerrit-plugin-api/BUCK
@@ -56,7 +56,7 @@ java_binary(
 java_doc(
   name = 'plugin-api-javadoc',
   title = 'Gerrit Review Plugin API Documentation',
-  pkg = 'com.google.gerrit',
+  pkgs = ['com.google.gerrit'],
   paths = [n for n in SRCS],
   srcs = glob([n + '**/*.java' for n in SRCS]),
   deps = [
diff --git a/gerrit-plugin-gwtui/BUCK b/gerrit-plugin-gwtui/BUCK
index 419176d4a5..67c04c2463 100644
--- a/gerrit-plugin-gwtui/BUCK
+++ b/gerrit-plugin-gwtui/BUCK
@@ -50,7 +50,7 @@ java_library(
 java_doc(
   name = 'gwtui-api-javadoc',
   title = 'Gerrit Review GWT Extension API Documentation',
-  pkg = 'com.google.gerrit',
+  pkgs = ['com.google.gerrit'],
   paths = ['src/main/java'] + COMMON,
   srcs = SRCS,
   deps = DEPS + ['//gerrit-gwtui-common:client-lib2'],
diff --git a/tools/java_doc.defs b/tools/java_doc.defs
index d117bda9b1..514a730a85 100644
--- a/tools/java_doc.defs
+++ b/tools/java_doc.defs
@@ -1,7 +1,7 @@
 def java_doc(
     name,
     title,
-    pkg,
+    pkgs,
     paths,
     srcs = [],
     deps = [],
@@ -24,7 +24,8 @@ def java_doc(
       '-notimestamp',
       '-windowtitle "' + title + '"',
       '-link http://docs.oracle.com/javase/7/docs/api',
-      '-subpackages ' + pkg,
+      '-subpackages ',
+      ':'.join(pkgs),
       '-sourcepath ',
       ':'.join(sourcepath),
       ' -classpath ',