diff --git a/build.xml b/build.xml
index 6dcf8771e7..f872e4042a 100644
--- a/build.xml
+++ b/build.xml
@@ -2120,6 +2120,11 @@ under the License.
                 <title>DDF - Dreadful Drawing Format</title>
                 <package name="org.apache.poi.ddf*"/>
             </group>
+            <group>
+                <title>XDDF - Open Office XML Dreadful Drawing Format</title>
+                <package name="org.apache.poi.xddf*"/>
+            </group>
+
             <group>
                 <title>HPSF - Horrible Property Set Format</title>
                 <package name="org.apache.poi.hpsf*"/>
@@ -2176,11 +2181,20 @@ under the License.
             <group>
                 <title>Utilities</title>
                 <package name="org.apache.poi.util*"/>
+                <package name="org.apache.poi.ooxml.util*"/>
+            </group>
+            <group>
+                <title>Common</title>
+                <package name="org.apache.poi.common*"/>
+            </group>
+            <group>
+                <title>Extractor</title>
+                <package name="org.apache.poi.extractor*"/>
+                <package name="org.apache.poi.ooxml.extractor*"/>
             </group>
             <group>
                 <title>Examples</title>
-                <package name="org.apache.poi.hpsf.examples*"/>
-                <package name="org.apache.poi.hssf.usermodel.examples*"/>
+                <package name="org.apache.poi.examples*"/>
             </group>
         </javadoc>
     </target>