diff --git a/docs/src/site/docbook/reference/core.xml b/docs/src/site/docbook/reference/core.xml
index 399026d59..266e9fdce 100644
--- a/docs/src/site/docbook/reference/core.xml
+++ b/docs/src/site/docbook/reference/core.xml
@@ -54,7 +54,7 @@
     <mediaobject>
       <imageobject role="fo">
         <imagedata align="center"
-                   fileref="images/spring-batch-reference-model.png"
+                   fileref="src/site/resources/reference/images/spring-batch-reference-model.png"
                    format="PNG" />
       </imageobject>
 
@@ -143,7 +143,7 @@
       </imageobject>
 
       <imageobject role="fo">
-        <imagedata align="center" fileref="images/job-heirarchy.png" />
+        <imagedata align="center" fileref="src/site/resources/reference/images/job-heirarchy.png" />
       </imageobject>
     </mediaobject>
 
diff --git a/docs/src/site/docbook/reference/execution.xml b/docs/src/site/docbook/reference/execution.xml
index cb9c097c7..44b04634c 100644
--- a/docs/src/site/docbook/reference/execution.xml
+++ b/docs/src/site/docbook/reference/execution.xml
@@ -18,7 +18,7 @@
 
       <imageobject role="fo">
         <imagedata align="center"
-                   fileref="images/spring-batch-reference-model.png" />
+                   fileref="src/site/resources/reference/images/spring-batch-reference-model.png" />
       </imageobject>
     </mediaobject>
 
@@ -91,7 +91,7 @@
       </imageobject>
 
       <imageobject role="fo">
-        <imagedata align="center" fileref="images/run-tier.png" />
+        <imagedata align="center" fileref="src/site/resources/reference/images/run-tier.png" />
       </imageobject>
     </mediaobject>
 
@@ -215,7 +215,7 @@
       </imageobject>
 
       <imageobject role="fo">
-        <imagedata align="center" fileref="images/jobTier.png" />
+        <imagedata align="center" fileref="src/site/resources/reference/images/jobTier.png" />
       </imageobject>
     </mediaobject>
 
@@ -254,7 +254,7 @@
 
         <imageobject role="fo">
           <imagedata align="center"
-                     fileref="images/job-launcher-sequence-sync.png" />
+                     fileref="src/site/resources/reference/images/job-launcher-sequence-sync.png" />
         </imageobject>
       </mediaobject>
 
@@ -275,7 +275,7 @@
 
         <imageobject role="fo">
           <imagedata align="center"
-                     fileref="images/job-launcher-sequence-async.png" />
+                     fileref="src/site/resources/reference/images/job-launcher-sequence-async.png" />
         </imageobject>
       </mediaobject>
 
@@ -565,7 +565,7 @@
       </imageobject>
 
       <imageobject role="fo">
-        <imagedata align="center" fileref="images/application-tier.png" />
+        <imagedata align="center" fileref="src/site/resources/reference/images/application-tier.png" />
       </imageobject>
     </mediaobject>
 
diff --git a/docs/src/site/docbook/reference/readersAndWriters.xml b/docs/src/site/docbook/reference/readersAndWriters.xml
index 4db30f6bf..cd04d0c98 100644
--- a/docs/src/site/docbook/reference/readersAndWriters.xml
+++ b/docs/src/site/docbook/reference/readersAndWriters.xml
@@ -831,7 +831,7 @@
 
     <para><mediaobject>
         <imageobject role="fo">
-          <imagedata align="center" fileref="images/xmlinput.png" format="PNG" />
+          <imagedata align="center" fileref="src/site/resources/reference/images/xmlinput.png" format="PNG" />
         </imageobject>
 
         <imageobject role="html">
@@ -853,7 +853,7 @@
 
     <para><mediaobject>
         <imageobject role="fo">
-          <imagedata align="center" fileref="images/oxm-fragments.png"
+          <imagedata align="center" fileref="src/site/resources/reference/images/oxm-fragments.png"
                      format="PNG" />
         </imageobject>
 
@@ -1370,7 +1370,7 @@ itemReader.close(executionContext);</programlisting>
         </imageobject>
 
         <imageobject role="fo">
-          <imagedata align="center" fileref="images/drivingQueryExample.png" />
+          <imagedata align="center" fileref="src/site/resources/reference/images/drivingQueryExample.png" />
         </imageobject>
       </mediaobject>
 
@@ -1387,7 +1387,7 @@ itemReader.close(executionContext);</programlisting>
         </imageobject>
 
         <imageobject role="fo">
-          <imagedata align="center" fileref="images/drivingQueryJob.png" />
+          <imagedata align="center" fileref="src/site/resources/reference/images/drivingQueryJob.png" />
         </imageobject>
       </mediaobject>
 
diff --git a/docs/src/site/docbook/reference/spring-batch-intro.xml b/docs/src/site/docbook/reference/spring-batch-intro.xml
index 45d063ccf..8d188272b 100644
--- a/docs/src/site/docbook/reference/spring-batch-intro.xml
+++ b/docs/src/site/docbook/reference/spring-batch-intro.xml
@@ -178,10 +178,11 @@
       <para>Spring Batch is designed with extensibility and a diverse group of
       end users in mind. The figure below shows a sketch of the layered
       architecture that supports the extensibility and ease of use for
-      end-user developers. <mediaobject>
+      end-user developers.
+		<mediaobject>
           <imageobject role="fo">
-            <imagedata align="center" fileref="images/spring-batch-layers.png"
-                       format="PNG" role="fo" />
+            <imagedata align="center" fileref="src/site/resources/reference/images/spring-batch-layers.png"
+                       format="PNG"/>
           </imageobject>
 
           <imageobject role="html">