diff --git a/pso-docx-ant/src/main/java/org/pageseeder/docx/ant/ExportTask.java b/pso-docx-ant/src/main/java/org/pageseeder/docx/ant/ExportTask.java
index 8ac0b71d..a3ad08e4 100644
--- a/pso-docx-ant/src/main/java/org/pageseeder/docx/ant/ExportTask.java
+++ b/pso-docx-ant/src/main/java/org/pageseeder/docx/ant/ExportTask.java
@@ -204,11 +204,14 @@ public void execute() throws BuildException {
     ZipUtils.unzip(this.dotx, prepacked);
     File document = new File(prepacked, "word/document.xml");
     Files.ensureDirectoryExists(document.getParentFile());
+    // prefix template media files with a random string to avoid clashes with PSML images
+    File mediaFolder = new File(prepacked, "word/media");
+    String mediaPrefix = "kwo5nu83zotp2-";
+    Files.renameFiles(mediaFolder, mediaPrefix);
 
-    // 3. (extra) copy everything from the media folder to prepacked folder
+    // 4. (extra) copy everything from the media folder to prepacked folder
     if (this.media != null) {
       log("Copy media files");
-      File mediaFolder = new File(prepacked, "word/media");
       if (!mediaFolder.exists()) {
         mediaFolder.mkdirs();
       }
@@ -220,7 +223,7 @@ public void execute() throws BuildException {
       }
     }
 
-    // 4. Unnest the files
+    // 5. Unnest the files
     log("Unnest");
     Templates unnest = XSLT.getTemplatesFromResource("org/pageseeder/docx/xslt/export-unnest.xsl");
     File sourceDocument = this.source;
@@ -229,8 +232,7 @@ public void execute() throws BuildException {
     Map<String, String> noParameters = Collections.emptyMap();
     XSLT.transform(sourceDocument, newSourceDocument, unnest, noParameters);
 
-
-    // 5. Process the files
+    // 6. Process the files
     log("Process with XSLT");
 
     // Parse templates
@@ -241,6 +243,7 @@ public void execute() throws BuildException {
     parameters.put("_outputfolder", prepacked.toURI().toString());
     parameters.put("_dotxfolder", dotx.toURI().toString());
     parameters.put("_docxfilename", this.destination.getName());
+    parameters.put("_mediaprefix", mediaPrefix);
     if (this.config != null) {
       parameters.put("_configfileurl", this.config.toURI().toString());
     }
@@ -253,7 +256,7 @@ public void execute() throws BuildException {
     // Transform
     XSLT.transform(newSourceDocument, document, templates, parameters);
 
-    // 6. Move or Zip the generated content
+    // 7. Move or Zip the generated content
     if (parameters.containsKey("expanded") && parameters.get("expanded").equals("true")) {
       log("Moving");
       prepacked.renameTo(this.destination);
diff --git a/pso-docx-ant/src/test/export/cases/core-properties/custom.xml b/pso-docx-ant/src/test/export/cases/core-properties/custom.xml
index 05f4f33a..d3d9f34d 100644
--- a/pso-docx-ant/src/test/export/cases/core-properties/custom.xml
+++ b/pso-docx-ant/src/test/export/cases/core-properties/custom.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?><Properties xmlns="http://schemas.openxmlformats.org/officeDocument/2006/custom-properties" xmlns:vt="http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes"><property fmtid="{D5CDD505-2E9C-101B-9397-08002B2CF9AE}" pid="2" name="Version"><vt:lpwstr>1.0</vt:lpwstr></property></Properties>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?><Properties xmlns="http://schemas.openxmlformats.org/officeDocument/2006/custom-properties" xmlns:vt="http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes"><property fmtid="{D5CDD505-2E9C-101B-9397-08002B2CF9AE}" pid="2" name="Version"><vt:lpwstr>1.0</vt:lpwstr></property><property fmtid="{D5CDD505-2E9C-101B-9397-08002B2CF9AE}" pid="3" name="Myprop"><vt:lpwstr>Myvalue</vt:lpwstr></property></Properties>
\ No newline at end of file
diff --git a/pso-docx-ant/src/test/export/cases/core-properties/word-export-template.docx b/pso-docx-ant/src/test/export/cases/core-properties/word-export-template.docx
index d4728479..e0b0ffe9 100644
Binary files a/pso-docx-ant/src/test/export/cases/core-properties/word-export-template.docx and b/pso-docx-ant/src/test/export/cases/core-properties/word-export-template.docx differ
diff --git a/pso-docx-ant/src/test/export/cases/empty-configuration-images/document.xml b/pso-docx-ant/src/test/export/cases/empty-configuration-images/document.xml
index dc09e2b6..6ed3ae04 100644
--- a/pso-docx-ant/src/test/export/cases/empty-configuration-images/document.xml
+++ b/pso-docx-ant/src/test/export/cases/empty-configuration-images/document.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?><w:document xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main"><w:body><w:bookmarkStart w:name="f-" w:id="0"/><w:bookmarkEnd w:id="0"/><w:bookmarkStart w:name="f-title" w:id="1"/><w:p><w:pPr><w:pStyle w:val="BodyText"/></w:pPr><w:r><w:rPr/><w:t xml:space="preserve">Test Case 7</w:t></w:r></w:p><w:bookmarkEnd w:id="1"/><w:bookmarkStart w:name="f-1" w:id="2"/><w:p><w:pPr><w:pStyle w:val="BodyText"/></w:pPr><w:r><w:rPr/><w:t xml:space="preserve">Basic Word document without configuration.</w:t></w:r></w:p><w:p><w:pPr><w:pStyle w:val="BodyText"/></w:pPr><w:r><w:rPr/><w:t xml:space="preserve">Test of images.</w:t></w:r></w:p><w:p><w:pPr><w:pStyle w:val="BodyText"/></w:pPr><w:r><w:rPr/><w:t xml:space="preserve">Image with caption:</w:t></w:r></w:p><w:p><w:pPr><w:pStyle w:val="BodyText"/></w:pPr><w:r><w:rPr/><w:t xml:space="preserve"/></w:r><w:r><w:pPr><w:rStyle w:val="DefaultParagraphFont"/></w:pPr><w:drawing><wp:inline xmlns:wp="http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing" distT="0" distB="0" distL="0" distR="0"><wp:extent cx="5724525" cy="4295775"/><wp:docPr id="1" name="image1" descr="" title="image1.jpg"/><a:graphic xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main"><a:graphicData uri="http://schemas.openxmlformats.org/drawingml/2006/picture"><pic:pic xmlns:pic="http://schemas.openxmlformats.org/drawingml/2006/picture"><pic:nvPicPr><pic:cNvPr id="0" name="whatever"/><pic:cNvPicPr/></pic:nvPicPr><pic:blipFill><a:blip xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" r:embed="rId17"/><a:stretch><a:fillRect/></a:stretch></pic:blipFill><pic:spPr><a:xfrm><a:off x="0" y="0"/><a:ext cx="5724525" cy="4295775"/></a:xfrm><a:prstGeom prst="rect"><a:avLst/></a:prstGeom></pic:spPr></pic:pic></a:graphicData></a:graphic></wp:inline></w:drawing></w:r><w:r><w:rPr/><w:t xml:space="preserve"/></w:r></w:p><w:p><w:pPr><w:pStyle w:val="BodyText"/></w:pPr><w:r><w:rPr/><w:t xml:space="preserve">Figure 1 Caption</w:t></w:r></w:p><w:p><w:pPr><w:pStyle w:val="BodyText"/></w:pPr><w:r><w:rPr/><w:t xml:space="preserve">Image without caption:</w:t></w:r></w:p><w:p><w:pPr><w:pStyle w:val="BodyText"/></w:pPr><w:r><w:rPr/><w:t xml:space="preserve"/></w:r><w:r><w:pPr><w:rStyle w:val="DefaultParagraphFont"/></w:pPr><w:drawing><wp:inline xmlns:wp="http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing" distT="0" distB="0" distL="0" distR="0"><wp:extent cx="2486025" cy="1866900"/><wp:docPr id="2" name="image2" descr="" title="image2.jpeg"/><a:graphic xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main"><a:graphicData uri="http://schemas.openxmlformats.org/drawingml/2006/picture"><pic:pic xmlns:pic="http://schemas.openxmlformats.org/drawingml/2006/picture"><pic:nvPicPr><pic:cNvPr id="0" name="whatever"/><pic:cNvPicPr/></pic:nvPicPr><pic:blipFill><a:blip xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" r:embed="rId18"/><a:stretch><a:fillRect/></a:stretch></pic:blipFill><pic:spPr><a:xfrm><a:off x="0" y="0"/><a:ext cx="2486025" cy="1866900"/></a:xfrm><a:prstGeom prst="rect"><a:avLst/></a:prstGeom></pic:spPr></pic:pic></a:graphicData></a:graphic></wp:inline></w:drawing></w:r><w:r><w:rPr/><w:t xml:space="preserve"/></w:r></w:p><w:bookmarkEnd w:id="2"/><w:sectPr xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:w14="http://schemas.microsoft.com/office/word/2010/wordml" xmlns:wne="http://schemas.microsoft.com/office/word/2006/wordml" xmlns:wp="http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing" xmlns:wp14="http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing" xmlns:wpc="http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas" xmlns:wpg="http://schemas.microsoft.com/office/word/2010/wordprocessingGroup" xmlns:wpi="http://schemas.microsoft.com/office/word/2010/wordprocessingInk" xmlns:wps="http://schemas.microsoft.com/office/word/2010/wordprocessingShape" w:rsidR="00125F2B"><w:headerReference w:type="even" r:id="rId8"/><w:headerReference w:type="default" r:id="rId9"/><w:footerReference w:type="even" r:id="rId10"/><w:footerReference w:type="default" r:id="rId11"/><w:headerReference w:type="first" r:id="rId12"/><w:footerReference w:type="first" r:id="rId13"/><w:pgSz w:w="11906" w:h="16838"/><w:pgMar w:top="1440" w:right="1440" w:bottom="1440" w:left="1440" w:header="708" w:footer="708" w:gutter="0"/><w:cols w:space="708"/><w:docGrid w:linePitch="360"/></w:sectPr></w:body></w:document>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?><w:document xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main"><w:body><w:bookmarkStart w:name="f-" w:id="0"/><w:bookmarkEnd w:id="0"/><w:bookmarkStart w:name="f-title" w:id="1"/><w:p><w:pPr><w:pStyle w:val="BodyText"/></w:pPr><w:r><w:rPr/><w:t xml:space="preserve">Test Case 7</w:t></w:r></w:p><w:bookmarkEnd w:id="1"/><w:bookmarkStart w:name="f-1" w:id="2"/><w:p><w:pPr><w:pStyle w:val="BodyText"/></w:pPr><w:r><w:rPr/><w:t xml:space="preserve">Basic Word document without configuration.</w:t></w:r></w:p><w:p><w:pPr><w:pStyle w:val="BodyText"/></w:pPr><w:r><w:rPr/><w:t xml:space="preserve">Test of images.</w:t></w:r></w:p><w:p><w:pPr><w:pStyle w:val="BodyText"/></w:pPr><w:r><w:rPr/><w:t xml:space="preserve">Image with caption:</w:t></w:r></w:p><w:p><w:pPr><w:pStyle w:val="BodyText"/></w:pPr><w:r><w:rPr/><w:t xml:space="preserve"/></w:r><w:r><w:pPr><w:rStyle w:val="DefaultParagraphFont"/></w:pPr><w:drawing><wp:inline xmlns:wp="http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing" distT="0" distB="0" distL="0" distR="0"><wp:extent cx="5724525" cy="4295775"/><wp:docPr id="1" name="image1" descr="" title="image1.jpg"/><a:graphic xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main"><a:graphicData uri="http://schemas.openxmlformats.org/drawingml/2006/picture"><pic:pic xmlns:pic="http://schemas.openxmlformats.org/drawingml/2006/picture"><pic:nvPicPr><pic:cNvPr id="0" name="whatever"/><pic:cNvPicPr/></pic:nvPicPr><pic:blipFill><a:blip xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" r:embed="rId18"/><a:stretch><a:fillRect/></a:stretch></pic:blipFill><pic:spPr><a:xfrm><a:off x="0" y="0"/><a:ext cx="5724525" cy="4295775"/></a:xfrm><a:prstGeom prst="rect"><a:avLst/></a:prstGeom></pic:spPr></pic:pic></a:graphicData></a:graphic></wp:inline></w:drawing></w:r><w:r><w:rPr/><w:t xml:space="preserve"/></w:r></w:p><w:p><w:pPr><w:pStyle w:val="BodyText"/></w:pPr><w:r><w:rPr/><w:t xml:space="preserve">Figure 1 Caption</w:t></w:r></w:p><w:p><w:pPr><w:pStyle w:val="BodyText"/></w:pPr><w:r><w:rPr/><w:t xml:space="preserve">Image without caption:</w:t></w:r></w:p><w:p><w:pPr><w:pStyle w:val="BodyText"/></w:pPr><w:r><w:rPr/><w:t xml:space="preserve"/></w:r><w:r><w:pPr><w:rStyle w:val="DefaultParagraphFont"/></w:pPr><w:drawing><wp:inline xmlns:wp="http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing" distT="0" distB="0" distL="0" distR="0"><wp:extent cx="2486025" cy="1866900"/><wp:docPr id="2" name="image2" descr="" title="image2.jpeg"/><a:graphic xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main"><a:graphicData uri="http://schemas.openxmlformats.org/drawingml/2006/picture"><pic:pic xmlns:pic="http://schemas.openxmlformats.org/drawingml/2006/picture"><pic:nvPicPr><pic:cNvPr id="0" name="whatever"/><pic:cNvPicPr/></pic:nvPicPr><pic:blipFill><a:blip xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" r:embed="rId19"/><a:stretch><a:fillRect/></a:stretch></pic:blipFill><pic:spPr><a:xfrm><a:off x="0" y="0"/><a:ext cx="2486025" cy="1866900"/></a:xfrm><a:prstGeom prst="rect"><a:avLst/></a:prstGeom></pic:spPr></pic:pic></a:graphicData></a:graphic></wp:inline></w:drawing></w:r><w:r><w:rPr/><w:t xml:space="preserve"/></w:r></w:p><w:bookmarkEnd w:id="2"/><w:sectPr xmlns:aink="http://schemas.microsoft.com/office/drawing/2016/ink" xmlns:am3d="http://schemas.microsoft.com/office/drawing/2017/model3d" xmlns:cx="http://schemas.microsoft.com/office/drawing/2014/chartex" xmlns:cx1="http://schemas.microsoft.com/office/drawing/2015/9/8/chartex" xmlns:cx2="http://schemas.microsoft.com/office/drawing/2015/10/21/chartex" xmlns:cx3="http://schemas.microsoft.com/office/drawing/2016/5/9/chartex" xmlns:cx4="http://schemas.microsoft.com/office/drawing/2016/5/10/chartex" xmlns:cx5="http://schemas.microsoft.com/office/drawing/2016/5/11/chartex" xmlns:cx6="http://schemas.microsoft.com/office/drawing/2016/5/12/chartex" xmlns:cx7="http://schemas.microsoft.com/office/drawing/2016/5/13/chartex" xmlns:cx8="http://schemas.microsoft.com/office/drawing/2016/5/14/chartex" xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:w14="http://schemas.microsoft.com/office/word/2010/wordml" xmlns:w15="http://schemas.microsoft.com/office/word/2012/wordml" xmlns:w16="http://schemas.microsoft.com/office/word/2018/wordml" xmlns:w16cex="http://schemas.microsoft.com/office/word/2018/wordml/cex" xmlns:w16cid="http://schemas.microsoft.com/office/word/2016/wordml/cid" xmlns:w16sdtdh="http://schemas.microsoft.com/office/word/2020/wordml/sdtdatahash" xmlns:w16se="http://schemas.microsoft.com/office/word/2015/wordml/symex" xmlns:wne="http://schemas.microsoft.com/office/word/2006/wordml" xmlns:wp="http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing" xmlns:wp14="http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing" xmlns:wpc="http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas" xmlns:wpg="http://schemas.microsoft.com/office/word/2010/wordprocessingGroup" xmlns:wpi="http://schemas.microsoft.com/office/word/2010/wordprocessingInk" xmlns:wps="http://schemas.microsoft.com/office/word/2010/wordprocessingShape" w:rsidR="007E5831" w:rsidRPr="00795CF0" w:rsidSect="00E51F66"><w:headerReference w:type="even" r:id="rId9"/><w:headerReference w:type="default" r:id="rId10"/><w:footerReference w:type="even" r:id="rId11"/><w:footerReference w:type="default" r:id="rId12"/><w:headerReference w:type="first" r:id="rId13"/><w:footerReference w:type="first" r:id="rId14"/><w:pgSz w:w="12240" w:h="15840"/><w:pgMar w:top="1440" w:right="1440" w:bottom="1440" w:left="1440" w:header="720" w:footer="720" w:gutter="0"/><w:cols w:space="720"/><w:titlePg/><w:docGrid w:linePitch="360"/></w:sectPr></w:body></w:document>
\ No newline at end of file
diff --git a/pso-docx-ant/src/test/export/cases/empty-configuration-images/document.xml.rels.xml b/pso-docx-ant/src/test/export/cases/empty-configuration-images/document.xml.rels.xml
new file mode 100644
index 00000000..249ba849
--- /dev/null
+++ b/pso-docx-ant/src/test/export/cases/empty-configuration-images/document.xml.rels.xml
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?><Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships"><Relationship Id="rId8" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/image" Target="media/kwo5nu83zotp2-image3.jpg"/><Relationship Id="rId13" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/header" Target="header3.xml"/><Relationship Id="rId3" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles" Target="styles.xml"/><Relationship Id="rId7" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/endnotes" Target="endnotes.xml"/><Relationship Id="rId12" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/footer" Target="footer2.xml"/><Relationship Id="rId2" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/numbering" Target="numbering.xml"/><Relationship Id="rId16" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme" Target="theme/theme1.xml"/><Relationship Id="rId1" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/customXml" Target="../customXml/item1.xml"/><Relationship Id="rId6" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/footnotes" Target="footnotes.xml"/><Relationship Id="rId11" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/footer" Target="footer1.xml"/><Relationship Id="rId5" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/webSettings" Target="webSettings.xml"/><Relationship Id="rId15" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/fontTable" Target="fontTable.xml"/><Relationship Id="rId10" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/header" Target="header2.xml"/><Relationship Id="rId4" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/settings" Target="settings.xml"/><Relationship Id="rId9" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/header" Target="header1.xml"/><Relationship Id="rId14" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/footer" Target="footer3.xml"/><Relationship Id="rId18" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/image" Target="media/image1.jpg"/><Relationship Id="rId19" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/image" Target="media/image2.jpeg"/></Relationships>
\ No newline at end of file
diff --git a/pso-docx-ant/src/test/export/cases/empty-configuration-images/footer3.xml.rels.xml b/pso-docx-ant/src/test/export/cases/empty-configuration-images/footer3.xml.rels.xml
new file mode 100644
index 00000000..3b5249f6
--- /dev/null
+++ b/pso-docx-ant/src/test/export/cases/empty-configuration-images/footer3.xml.rels.xml
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?><Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships"><Relationship Id="rId1" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/image" Target="media/kwo5nu83zotp2-image1.jpg"/></Relationships>
\ No newline at end of file
diff --git a/pso-docx-ant/src/test/export/cases/empty-configuration-images/header3.xml.rels.xml b/pso-docx-ant/src/test/export/cases/empty-configuration-images/header3.xml.rels.xml
new file mode 100644
index 00000000..4347000b
--- /dev/null
+++ b/pso-docx-ant/src/test/export/cases/empty-configuration-images/header3.xml.rels.xml
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?><Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships"><Relationship Id="rId1" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/image" Target="media/kwo5nu83zotp2-image2.jpeg"/></Relationships>
\ No newline at end of file
diff --git a/pso-docx-ant/src/test/export/cases/empty-configuration-images/word-export-template.docx b/pso-docx-ant/src/test/export/cases/empty-configuration-images/word-export-template.docx
new file mode 100644
index 00000000..5d0b3094
Binary files /dev/null and b/pso-docx-ant/src/test/export/cases/empty-configuration-images/word-export-template.docx differ
diff --git a/pso-docx-ant/src/test/export/cases/empty-configuration-images/word-export-template.dotx b/pso-docx-ant/src/test/export/cases/empty-configuration-images/word-export-template.dotx
deleted file mode 100644
index 387b35b4..00000000
Binary files a/pso-docx-ant/src/test/export/cases/empty-configuration-images/word-export-template.dotx and /dev/null differ
diff --git a/pso-docx-ant/src/test/java/org/pageseeder/docx/ant/ExportTaskTest.java b/pso-docx-ant/src/test/java/org/pageseeder/docx/ant/ExportTaskTest.java
index a67ceac1..a449e091 100644
--- a/pso-docx-ant/src/test/java/org/pageseeder/docx/ant/ExportTaskTest.java
+++ b/pso-docx-ant/src/test/java/org/pageseeder/docx/ant/ExportTaskTest.java
@@ -175,7 +175,8 @@ public void testEmptyConfigurationHeadings() throws IOException, SAXException {
 
   @Test
   public void testEmptyConfigurationImages() throws IOException, SAXException {
-    testIndividual("empty-configuration-images");
+    testIndividual("empty-configuration-images",
+            "document,document.xml.rels,footer3.xml.rels,header3.xml.rels");
   }
 
   @Test
@@ -589,6 +590,9 @@ public void testIndividual(File dir, String filenames, boolean saveWorking) thro
                 ("core".equals(name) || "custom".equals(name)) ? "working/prepacked/docProps/" :
                 "item1".equals(name) ? "working/prepacked/customXml/" :
                 "working/prepacked/word/") + name + ".xml");
+          if (name.endsWith(".rels")) {
+            actual = new File(result, "working/prepacked/word/_rels/" + name);
+          }
           File expected = new File(dir, name + ".xml");
 
           // Check that the files exist
diff --git a/pso-docx-core/src/main/java/org/pageseeder/docx/DOCXProcessor.java b/pso-docx-core/src/main/java/org/pageseeder/docx/DOCXProcessor.java
index 6ff11e06..f0100e2f 100644
--- a/pso-docx-core/src/main/java/org/pageseeder/docx/DOCXProcessor.java
+++ b/pso-docx-core/src/main/java/org/pageseeder/docx/DOCXProcessor.java
@@ -107,18 +107,21 @@ public void process() throws IOException {
     ZipUtils.unzip(this._builder.dotx(), prepacked);
     File document = new File(prepacked, "word/document.xml");
     Files.ensureDirectoryExists(document.getParentFile());
+    // prefix template media files with a random string to avoid clashes with PSML images
+    File mediaFolder = new File(prepacked, "word/media");
+    String mediaPrefix = "kwo5nu83zotp2-";
+    Files.renameFiles(mediaFolder, mediaPrefix);
 
-    // 3. (extra) copy everything from the media folder to prepacked folder
+    // 4. (extra) copy everything from the media folder to prepacked folder
     if (this._builder.media() != null) {
       log("Copy media files");
-      File mediaFolder = new File(prepacked, "word/media");
       if (!mediaFolder.exists()) {
         mediaFolder.mkdirs();
       }
       Files.copyDirectory(this._builder.media(), mediaFolder);
     }
 
-    // 4. Unnest the files
+    // 5. Unnest the files
     log("Unnest");
     Templates unnest = XSLT.getTemplatesFromResource("org/pageseeder/docx/xslt/export-unnest.xsl");
     File sourceDocument = this._builder.source();
@@ -127,7 +130,7 @@ public void process() throws IOException {
     Map<String, String> noParameters = Collections.emptyMap();
     XSLT.transform(sourceDocument, newSourceDocument, unnest, noParameters);
 
-    // 5. Process the files
+    // 6. Process the files
     log("Process with XSLT");
     // Parse templates
     Templates templates = XSLT.getTemplatesFromResource("org/pageseeder/docx/xslt/export.xsl");
@@ -137,6 +140,7 @@ public void process() throws IOException {
     parameters.put("_outputfolder", prepacked.toURI().toString());
     parameters.put("_dotxfolder", dotx.toURI().toString());
     parameters.put("_docxfilename", this._builder.destination().getName());
+    parameters.put("_mediaprefix", mediaPrefix);
     if (this._builder.config() != null) {
       parameters.put("_configfileurl", this._builder.config().toURI().toString());
     }
@@ -147,7 +151,7 @@ public void process() throws IOException {
     // Transform
     XSLT.transform(newSourceDocument, document, templates, parameters);
 
-    // 6. Move or Zip the generated content
+    // 7. Move or Zip the generated content
     if (parameters.containsKey("expanded") && parameters.get("expanded").equals("true")) {
       log("Moving");
       prepacked.renameTo(this._builder.destination());
diff --git a/pso-docx-core/src/main/java/org/pageseeder/docx/util/Files.java b/pso-docx-core/src/main/java/org/pageseeder/docx/util/Files.java
index ab47103e..95b4ca18 100644
--- a/pso-docx-core/src/main/java/org/pageseeder/docx/util/Files.java
+++ b/pso-docx-core/src/main/java/org/pageseeder/docx/util/Files.java
@@ -61,6 +61,23 @@ public static void ensureDirectoryExists(File directory) throws DOCXException {
     }
   }
 
+  /**
+   * Rename all the files in the specified directory by adding a prefix to them.
+   *
+   * @param dir    the directory
+   * @param prefix the prefix
+   */
+  public static void renameFiles(File dir, String prefix) {
+    if (dir.exists() && dir.isDirectory()) {
+      File[] children = dir.listFiles();
+      if (children != null) {
+        for (File child : children) {
+          child.renameTo(new File(dir, prefix + child.getName()));
+        }
+      }
+    }
+  }
+
   /**
    * @param source The source folder
    * @param target The target folder
diff --git a/pso-docx-core/src/main/resources/org/pageseeder/docx/xslt/export.xsl b/pso-docx-core/src/main/resources/org/pageseeder/docx/xslt/export.xsl
index de1b1583..0589539a 100644
--- a/pso-docx-core/src/main/resources/org/pageseeder/docx/xslt/export.xsl
+++ b/pso-docx-core/src/main/resources/org/pageseeder/docx/xslt/export.xsl
@@ -88,6 +88,9 @@
 <!-- The name of the DOCX file to create -->
 <xsl:param name="_docxfilename"/>
 
+<!-- Prefix for template media files to avoid clashes with PSML images -->
+<xsl:param name="_mediaprefix"/>
+
 <!-- The location of the configuration file used -->
 <xsl:param name="_configfileurl"/>
 
diff --git a/pso-docx-core/src/main/resources/org/pageseeder/docx/xslt/export/word-content_types.xsl b/pso-docx-core/src/main/resources/org/pageseeder/docx/xslt/export/word-content_types.xsl
index 05ca8ceb..a26ef2ea 100644
--- a/pso-docx-core/src/main/resources/org/pageseeder/docx/xslt/export/word-content_types.xsl
+++ b/pso-docx-core/src/main/resources/org/pageseeder/docx/xslt/export/word-content_types.xsl
@@ -21,6 +21,7 @@
                 xmlns:config="http://pageseeder.org/docx/config"
                 xmlns:vt="http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes"
                 xmlns:cust="http://schemas.openxmlformats.org/officeDocument/2006/custom-properties"
+                xmlns:rel="http://schemas.openxmlformats.org/package/2006/relationships"
                 exclude-result-prefixes="#all">
 
 <!--
@@ -49,6 +50,22 @@
               </xsl:result-document>
             </xsl:if>
           </xsl:if>
+          <xsl:if test="starts-with(@PartName, '/word/header')">
+            <xsl:variable name="suffix" select="substring-after(@PartName, '/word/header')"/>
+            <xsl:if test="doc-available(concat($_dotxfolder,'/word/_rels/header',$suffix, '.rels'))">
+              <xsl:result-document href="{concat($_outputfolder,'/word/_rels/header',$suffix, '.rels')}">
+                <xsl:apply-templates select="document(concat($_dotxfolder,'/word/_rels/header',$suffix, '.rels'))" mode="relationship" />
+              </xsl:result-document>
+            </xsl:if>
+          </xsl:if>
+          <xsl:if test="starts-with(@PartName, '/word/footer')">
+            <xsl:variable name="suffix" select="substring-after(@PartName, '/word/footer')"/>
+            <xsl:if test="doc-available(concat($_dotxfolder,'/word/_rels/footer',$suffix, '.rels'))">
+              <xsl:result-document href="{concat($_outputfolder,'/word/_rels/footer',$suffix, '.rels')}">
+                <xsl:apply-templates select="document(concat($_dotxfolder,'/word/_rels/footer',$suffix, '.rels'))" mode="relationship" />
+              </xsl:result-document>
+            </xsl:if>
+          </xsl:if>
         </xsl:if>
       </xsl:for-each>
       <!-- TODO: Extension should probably look for last '.' -->
@@ -185,7 +202,7 @@
     <xsl:result-document href="{concat($_outputfolder,'word/_rels/document.xml.rels')}">
       <Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships">
         <xsl:for-each select="document($_document-relationship)//*">
-          <xsl:copy-of select=".[name() = 'Relationship'][@Target!='comments.xml']"/>
+          <xsl:apply-templates select=".[name() = 'Relationship'][@Target!='comments.xml']" mode="relationship"/>
         </xsl:for-each>
         <xsl:if test="config:generate-comments()">
           <Relationship Id="{concat('rId',(count(document($_document-relationship)//*[name() = 'Relationship']) + 1))}" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/comments"
@@ -339,6 +356,24 @@
   </xsl:copy>
 </xsl:template>
 
+<!-- Template to prefix media files to avoid clashes -->
+<xsl:template match="rel:Relationship" mode="relationship">
+  <xsl:copy>
+    <xsl:copy-of select="@*[name() != 'Target']" />
+    <xsl:attribute name="Target" select="if (starts-with(@Target, 'media/'))
+      then concat('media/', $_mediaprefix, substring-after(@Target, 'media/')) else @Target " />
+    <xsl:apply-templates mode="relationship" />
+  </xsl:copy>
+</xsl:template>
+
+<!-- Template to copy each node recursively -->
+<xsl:template match="*" mode="relationship">
+  <xsl:copy>
+    <xsl:copy-of select="@*" />
+    <xsl:apply-templates mode="relationship" />
+  </xsl:copy>
+</xsl:template>
+
 <!-- Template to copy each node recursively -->
 <xsl:template match="* | @*" mode="copy">
   <xsl:copy>
diff --git a/version.txt b/version.txt
index 3ab09996..925a2b19 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-0.8.23
\ No newline at end of file
+0.8.24
\ No newline at end of file