diff --git a/ws/Docbook/Extensions/Tdata/Makefile b/ws/Docbook/Extensions/Tdata/Makefile
index 0c39a5a816db6100df6d1da2a6420ce3dbb75e70..75790c04ab54193f9cf5cf0e5f1c5451eb9237a7 100644
--- a/ws/Docbook/Extensions/Tdata/Makefile
+++ b/ws/Docbook/Extensions/Tdata/Makefile
@@ -87,7 +87,7 @@ ${BUILDROOT_SRC}/${SCRIPTBASENAME}.xml: ${SCRIPTBASENAME}.xml
 	cd  ${BUILDROOT_SRC}/Resources; $(MAKE) -f ../make.image; rm -rf `find . -name Generate`
 
 webhelp:${BUILDROOT_SRC}/${SCRIPTBASENAME}_html.xml
-	${SAXON6CMD} ${BUILDROOT_SRC}/${SCRIPTBASENAME}_html.xml ${DBOOK_XSL_CUSTOM}/webhelp/webhelpHdm.xsl ${dbookXslWebhelpParam}
+	${SAXON6CMD} $< ${DBOOK_XSL_CUSTOM}/webhelp/webhelpHdm.xsl ${dbookXslWebhelpParam}
 	cd ${BUILDROOT_SRC}/Resources; rsync -av * ${DIR}/${BUILDROOT_WEBHELP}
 	cp -r ${DBOOK_XSL}/webhelp/template/* ${BUILDROOT_WEBHELP}     # Images, Css
 	cat ${DBOOK_XSL_CUSTOM}/webhelp/common/css/positioning.supp.css >> ${BUILDROOT_WEBHELP}/common/css/positioning.css  # highlighting supplements
@@ -106,6 +106,7 @@ webhelp:${BUILDROOT_SRC}/${SCRIPTBASENAME}_html.xml
           '-Djavax.xml.parsers.SAXParserFactory=org.ccil.cowan.tagsoup.jaxp.SAXFactoryImpl' \
           -cp '${DBOOK_XSL}/extensions/webhelpindexer.jar:${DBOOK_XSL}/extensions/lucene-analyzers-3.0.0.jar:${DBOOK_XSL}/extensions/lucene-core-3.0.0.jar:${DBOOK_XSL}/extensions/tagsoup-1.2.1.jar' \
            com.nexwave.nquindexer.IndexerMain
+	ln -sf ../Slides ${BUILDROOT_WEBHELP} || true
 
 epub: ${BUILDROOT_SRC}/${SCRIPTBASENAME}_html.xml
 	${SAXON6CMD} $< ${DBOOK_XSL_CUSTOM}/epub/chunkHdm.xsl ${dbookXslEpubParam}
@@ -119,10 +120,13 @@ slides: ${BUILDROOT}/src/${SCRIPTBASENAME}_html.xml
 	cd ${BUILDROOT_SRC}/Resources; rsync -av * ${DIR}/${BUILDROOT}/Slides
 	ln -sf /usr/share/reveal.js ${BUILDROOT}/Slides
 
-pdf: fig.xml
-	/usr/share/xmlmind/bin/xxetool convert $(DEBUG) ${XSLPARAM_pdf} \
-          db5.toPSFile fig.xml \
-          -s pdf -s "|pdf" -u  $(BUILDROOT)/printversion.pdf
+# See http://stackoverflow.com/questions/39786947/how-to-convert-to-pdf-from-xsl-fo-with-mathml/39796975
+pdf: ${BUILDROOT_SRC}/${SCRIPTBASENAME}_print.xml
+	mkdir -p  ${BUILDROOT}/pdf
+	cd ${BUILDROOT_SRC}/Resources; tar cv- `find . -name Ref -and -type d|grep -v ^\./target`|tar -x -C ${DIR}/${BUILDROOT}/pdf
+	${SAXON6CMD} $< ${DBOOK_XSL}/fo/docbook.xsl ${dbookXslCommonParam} > ${BUILDROOT}/pdf/${SCRIPTBASENAME}.fo
+	/usr/share/hdm-fop/fop-2.2/fop/fop -fo ${BUILDROOT}/pdf/${SCRIPTBASENAME}.fo -pdf ${BUILDROOT}/pdf/${SCRIPTBASENAME}.pdf
+
 xsl:
 	rm -rf  $(XSLTESTDIR); mkdir $(XSLTESTDIR)
 	cd $(XSLTESTDIR); saxon-xslt ../fig.xml /usr/share/xmlmind/addon/config/docbook5/xslCustom/webhelpHdm.xsl
diff --git a/ws/Docbook/Extensions/Tdata/fig.xml b/ws/Docbook/Extensions/Tdata/fig.xml
index 3bb6d3d050b1ac661c355d5b94cdf800302ff48f..1553676fde55b402d7c81f93239cfca641f7e2c2 100644
--- a/ws/Docbook/Extensions/Tdata/fig.xml
+++ b/ws/Docbook/Extensions/Tdata/fig.xml
@@ -82,9 +82,4 @@
 
   <xi:include href="Video/video.xml" xpointer="element(/1)"/>
 
-  <appendix>
-    <title>Ter</title>
-
-    <para/>
-  </appendix>
 </book>
diff --git a/ws/Docbook/Preprocess/Xsl/docbook2html.xsl b/ws/Docbook/Preprocess/Xsl/docbook2html.xsl
index 1bdd977d18f4e3120e2578e854b70f4208ee6fd9..c7bcaf7a15fd70aefe41219a98e72372e1cd469a 100644
--- a/ws/Docbook/Preprocess/Xsl/docbook2html.xsl
+++ b/ws/Docbook/Preprocess/Xsl/docbook2html.xsl
@@ -15,6 +15,16 @@
   </xsl:template>
   
   
+  <xsl:template match="db:chapter/db:title | db:section/db:title">
+    <xsl:copy-of select="."/>
+    <xsl:for-each select="parent::*[contains(@annotations, 'slide') or descendant::*[contains(@annotations, 'slide')]]">
+        <para>
+          <link xlink:href="Slides/{@xml:id}.html">Related slides on offer</link>
+        </para>
+    </xsl:for-each>
+    
+  </xsl:template>
+  
   <xsl:template match="db:figure[db:mediaobject/db:imageobject]/db:title">
     
     <xsl:copy>
diff --git a/ws/Docbook/Preprocess/Xsl/docbook2print.xsl b/ws/Docbook/Preprocess/Xsl/docbook2print.xsl
index c711041db6a1f52d160f90917d85e280ea57735a..6e54788624f27b7f98ab2bf874cfcbdca7f6c125 100644
--- a/ws/Docbook/Preprocess/Xsl/docbook2print.xsl
+++ b/ws/Docbook/Preprocess/Xsl/docbook2print.xsl
@@ -19,7 +19,7 @@
             <xsl:copy-of select="@*"/>
             <xsl:attribute name="fileref">
                 <xsl:value-of select="@fileref"/>
-                <xsl:text>.pdf</xsl:text>
+                <xsl:text>.svg</xsl:text>
             </xsl:attribute>
         </imagedata>
     </xsl:template>