diff --git a/build.xml b/build.xml
index 7a666b6f518..76b37fc31e1 100644
--- a/build.xml
+++ b/build.xml
@@ -348,10 +348,16 @@
       <condition property="javadoc-1-5-contrib">
         <equals arg1="1.5" arg2="${ant.java.version}" />
       </condition>
-      <dirset dir="contrib/gdata-server/src/java" id="gdata-server">
+      <dirset dir="contrib/gdata-server/src/core/src/java" id="gdata-server-core">
         <include name="**" if="javadoc-1-5-contrib" />
       </dirset>
-  
+      <dirset dir="contrib/gdata-server/src/gom/src/java" id="gdata-server-gom">
+        <include name="**" if="javadoc-1-5-contrib" />
+      </dirset>
+      <dirset dir="contrib/gdata-server/src/hivemind/src/java" id="gdata-server-hivemind">
+        <include name="**" if="javadoc-1-5-contrib" />
+      </dirset>
+
       <javadoc
           overview="src/java/overview.html"
           packagenames="org.apache.lucene.*"
@@ -389,7 +395,9 @@
         <packageset dir="contrib/wordnet/src/java"/>
           <packageset dir="contrib/benchmark/src/java"/>
         
-        <packageset refid="gdata-server" />
+        <packageset refid="gdata-server-core" />
+        <packageset refid="gdata-server-gom" />
+        <packageset refid="gdata-server-hivemind" />
 
         <group title="Core" packages="org.apache.*:org.apache.lucene.analysis:org.apache.lucene.analysis.standard*"/>