diff --git a/build.xml b/build.xml
index be6128a3d8d14bc19b00f840d526cf72f1529f6f..4c98ebedafb479645aca257e3d6a8bffff821381 100644
--- a/build.xml
+++ b/build.xml
@@ -39,7 +39,6 @@
     <!-- Create dirs -->
     <mkdir dir="${builddir}/reports"/>
     <mkdir dir="${builddir}/reports/coverage"/>
-    <mkdir dir="${builddir}/apidocs"/>
 
     <!-- PHP CodeSniffer -->
     <exec command="phpcs --standard=PEAR --extensions=php --report=checkstyle ${srcdir}/module/VuFind/src &gt; ${builddir}/reports/checkstyle.xml" escape="false" />
@@ -48,16 +47,22 @@
     <phingcall target="phpunit"/>
 
     <!-- PHP API Documentation -->
+    <phingcall target="phpdoc"/>
+  </target>
+
+  <!-- PHP API Documentation -->
+  <target name="phpdoc">
+    <mkdir dir="${builddir}/apidocs"/>
     <phpdoc2 title="VuFind API Documentation"
       destdir="${builddir}/apidocs">
       <fileset dir=".">
         <include name="module/VuFind/src/**/*.php" />
         <!-- These files break phpdoc2; exclude until we can figure out why: -->
+        <exclude name="module/VuFind/src/VuFind/Hierarchy/**/*.php" />
         <exclude name="module/VuFind/src/VuFind/Log/Writer/Stream.php" />
         <exclude name="module/VuFind/src/VuFind/SMS/*.php" />
       </fileset>
     </phpdoc2>
-
   </target>
 
   <!-- PHPUnit -->