diff --git a/build.xml b/build.xml
index caf0ac910..c4e29a597 100644
--- a/build.xml
+++ b/build.xml
@@ -13,9 +13,7 @@
 
     TO BE COMPLETED:
 
-    * Fix logo's in site build.
-    * Add gump build
-    * Add jar target
+    NONE
  -->
 <project name="POI Build" default="compile" basedir=".">
 
@@ -300,20 +298,28 @@
         </uptodate>
     </target>
 
+    <target name="-check-forrest-installed" unless="env.FORREST_HOME">
+        <echo>
+            Please install apache forrest and set the
+            FORREST_HOME environment variable.
+        </echo>
+        <fail/>
+    </target>
+
     <!--    <target name="check-docs">-->
     <!--        <uptodate property="main.docs.notRequired" targetfile="${build.site}/index.html" >-->
     <!--            <srcfiles dir= "${build.site.src}"/>-->
     <!--        </uptodate>-->
     <!--    </target>-->
 
-    <target name="docs" depends="init,-check-docs" unless="main.docs.notRequired"
+    <target name="docs" depends="init,-check-forrest-installed,-check-docs" unless="main.docs.notRequired"
         description="Builds the POI website">
 
         <mkdir dir="${build.site.src}/src/documentation/content/apidocs"/>
         <copy todir="${build.site.src}/src/documentation/content/apidocs">
             <fileset dir="${apidocs.report.dir}"/>
         </copy>
-        <copy tofile="${build.site.src}/src/documentation/content/jdepend.ehtml" file="${jdepend.report.dir}/index.html"/>
+        <copy tofile="${build.site.src}/src/documentation/content/jdepend.ehtml" file="${jdepend.report.dir}/index.html" failonerror="false"/>
         <mkdir dir="${build.site.src}/src/documentation/content/junit"/>
         <copy todir="${build.site.src}/src/documentation/content/junit">
             <fileset dir="${junit.report.dir}"/>
diff --git a/src/documentation/skinconf.xml b/src/documentation/skinconf.xml
index 5f109a284..213d267e0 100644
--- a/src/documentation/skinconf.xml
+++ b/src/documentation/skinconf.xml
@@ -57,13 +57,13 @@ be used to configure the chosen Forrest skin.
        skin: forrest-site renders it at the top -->
   <project-name>POI</project-name>
   <project-url>http://jakarta.apache.org/poi/</project-url>
-  <project-logo>images/project-logo.gif</project-logo>
+  <project-logo>resources/images/project-logo.gif</project-logo>
 
   <!-- optional group logo
        skin: forrest-site renders it at the top-left corner -->
   <group-name>Jakarta</group-name>
   <group-url>http://jakarta.apache.org</group-url>
-  <group-logo>images/group-logo.gif</group-logo>
+  <group-logo>resources/images/group-logo.gif</group-logo>
 
   <!-- optional host logo (e.g. sourceforge logo)
        skin: forrest-site renders it at the bottom-left corner -->