diff --git a/buildSrc/src/main/groovy/docbook/DocbookPlugin.groovy b/buildSrc/src/main/groovy/docbook/DocbookPlugin.groovy
index 3ee2ed6efd..dae24e8ab4 100644
--- a/buildSrc/src/main/groovy/docbook/DocbookPlugin.groovy
+++ b/buildSrc/src/main/groovy/docbook/DocbookPlugin.groovy
@@ -72,6 +72,8 @@ public class Docbook extends DefaultTask {
 
     String admonGraphicsPath;
 
+    String imgSrcPath;
+
     @InputDirectory
     File sourceDirectory = new File(project.getProjectDir(), "src/docbook");
 
@@ -115,11 +117,15 @@ public class Docbook extends DefaultTask {
             }
 
             transformer.setParameter("highlight.xslthl.config", new File(highlightingDir, "xslthl-config.xml").toURI().toURL());
+        }
 
-            if (admonGraphicsPath != null) {
-                transformer.setParameter("admon.graphics", "1");
-                transformer.setParameter("admon.graphics.path", admonGraphicsPath);
-            }
+        if (admonGraphicsPath != null) {
+            transformer.setParameter("admon.graphics", "1");
+            transformer.setParameter("admon.graphics.path", admonGraphicsPath);
+        }
+
+        if (imgSrcPath != null) {
+            transformer.setParameter("img.src.path", imgSrcPath);
         }
 
         preTransform(transformer, srcFile, outputFile);
@@ -257,9 +263,9 @@ class DocbookFoPdf extends Docbook {
             }
         }
 
-        if (!foFile.delete()) {
+/*        if (!foFile.delete()) {
             logger.warn("Failed to delete 'fo' file " + foFile);
-        }
+        }*/
     }
 
     private File getPdfOutputFile(File foFile) {
diff --git a/docs/docs.gradle b/docs/docs.gradle
index 981eefab46..2fa31dfe05 100644
--- a/docs/docs.gradle
+++ b/docs/docs.gradle
@@ -33,7 +33,8 @@ project('manual') {
     docbookHtmlSingle.stylesheet = new File(projectDir, 'src/xsl/html-single-custom.xsl')
     docbookFoPdf.stylesheet = new File(projectDir, 'src/xsl/pdf-custom.xsl')
     def imagesDir = new File(projectDir, 'src/docbook/images');
-    docbookFoPdf.admonGraphicsPath = "${imagesDir}/"
+//    docbookFoPdf.admonGraphicsPath = "${imagesDir}/"
+    docbookFoPdf.imgSrcPath = "${projectDir}/src/docbook/"
 
     spec = copySpec {
         into ('reference') {