diff --git a/Doc/Common/glossary.xml b/Doc/Common/glossary.xml
index 176683af9e60ac9278d73120a543a037d03e88a2..ec366f1a1f013ed48ec87a22a506a3177e55cecf 100644
--- a/Doc/Common/glossary.xml
+++ b/Doc/Common/glossary.xml
@@ -460,6 +460,15 @@
       </glossdef>
     </glossentry>
 
+    <glossentry xml:id="glo_PNG">
+      <glossterm><acronym>PNG</acronym></glossterm>
+
+      <glossdef>
+        <para><link xlink:href="https://www.w3.org/TR/PNG">Portable Network
+        Graphics</link></para>
+      </glossdef>
+    </glossentry>
+
     <glossentry xml:id="glo_pom.xml">
       <glossterm>pom.xml</glossterm>
 
diff --git a/Doc/Makefile b/Doc/Makefile
index c27a927bc3053173c4a36ae7ed5da8fb02da3bc9..3969140c35c39e0aab0cf5567a498ec49b8cd410 100644
--- a/Doc/Makefile
+++ b/Doc/Makefile
@@ -64,6 +64,7 @@ ${BUILDROOT}/${SCRIPTBASENAME}.xml: ${SCRIPTBASENAME}.xml Common/glossary.xml Co
 	mkdir -p ${BUILDROOT};
 	${SAXONCMD} -s:${SCRIPTBASENAME}.xml -xsl:../ws/Docbook/Extensions/Xsl/docbook2docbook.xsl >  ${BUILDROOT}/${SCRIPTBASENAME}.xml
 	${SAXONCMD} -s:${BUILDROOT}/${SCRIPTBASENAME}.xml -xsl:../ws/Docbook/Extensions/Xsl/docbook2print.xsl >  ${BUILDROOT}/${SCRIPTBASENAME}_print.xml
+	${SAXONCMD} -s:${BUILDROOT}/${SCRIPTBASENAME}.xml -xsl:../ws/Docbook/Extensions/Xsl/docbook2epub.xsl >  ${BUILDROOT}/${SCRIPTBASENAME}_epub.xml
 	cd ${BUILDROOT}; ${SAXONCMD} -s:${SCRIPTBASENAME}.xml -xsl:../../ws/Docbook/Extensions/Xsl/docbookExtractFig.xsl 
 	for module in ${DOCMODULES}; do \
             tar c- $$module/Ref| tar -x -C ${BUILDROOT}; \
@@ -87,7 +88,6 @@ ${BUILDROOT}/mobil/index.html:${BUILDROOT}/${SCRIPTBASENAME}.xml
 	cd  ${BUILDROOT};\
           /usr/share/xmlmind/bin/xxetool convert ${XSLPARAM} db5.toEclipseHelp \
            ${SCRIPTBASENAME}.xml -u mobil
-	cd  ${BUILDROOT}/mobil;ln -sf /home/info1/doc/navi/de.hdm_stuttgart.mi.lectures/P .
 
 ${BUILDROOT}/webhelp/printversion.pdf: ${BUILDROOT}/${SCRIPTBASENAME}_print.xml
 	cd ${BUILDROOT};\
@@ -97,7 +97,7 @@ ${BUILDROOT}/webhelp/printversion.pdf: ${BUILDROOT}/${SCRIPTBASENAME}_print.xml
 ${BUILDROOT}/webhelp/lectures.epub: ${BUILDROOT}/${SCRIPTBASENAME}.xml
 	cd ${BUILDROOT};\
           /usr/share/xmlmind/bin/xxetool convert ${XSLPARAM} \
-          db5.toEpub  ${SCRIPTBASENAME}.xml -u  webhelp/lectures.epub
+          db5.toEpub  ${SCRIPTBASENAME}_epub.xml -u  webhelp/lectures.epub
 
 #${BUILDROOT}/${BUILDNAVI}/index.html: ${BUILDROOT}/${SCRIPTBASENAME}.xml
 #        cd  ${BUILDROOT};\
diff --git a/Doc/lectures.xml b/Doc/lectures.xml
index 83f2fac49a887ee9d0e4022500a9f7ba9c9c6b67..ec03f8f414a0d2bc844fc6d988e49b75ecc8e51a 100644
--- a/Doc/lectures.xml
+++ b/Doc/lectures.xml
@@ -81,12 +81,16 @@
           xlink:href="https://www.mathjax.org">MathJax JavaScript</link>
           rendering.</para>
 
+          <para> <xref linkend="glo_EPUB"/> suitable for (some) E-book
+          readers.</para>
+
           <caution>
-            <para>Some older <productname
+            <para>Since <productname
             xlink:href="https://en.wikipedia.org/wiki/EPUB">Epub</productname>
-            readers may not support current standards. <productname
-            xlink:href="http://calibre-ebook.com">Calibre</productname> is
-            known to work.</para>
+            readers do not (yet) support <xref linkend="glo_EPUB"/> 3.0
+            formulas and <xref linkend="glo_SVG"/> images have been converted
+            to <xref linkend="glo_PNG"/> files. This may account for poor
+            image quality.</para>
           </caution>
         </glossdef>
       </glossentry>
diff --git a/ws/Docbook/Extensions/Xsl/docbook2epub.xsl b/ws/Docbook/Extensions/Xsl/docbook2epub.xsl
new file mode 100644
index 0000000000000000000000000000000000000000..e3754e4d1a3e12023f35c5e79d8702fa809aa92e
--- /dev/null
+++ b/ws/Docbook/Extensions/Xsl/docbook2epub.xsl
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="2.0"
+    xmlns:db="http://docbook.org/ns/docbook"
+    xmlns:xlink="http://www.w3.org/1999/xlink"
+    xmlns="http://docbook.org/ns/docbook">
+    
+    <xsl:variable name="generateIdPrefix">__sdwordm4342cs__</xsl:variable>
+    
+    <xsl:output indent="no"/>
+    
+    <xsl:template match="@* | node()">
+        <xsl:copy>
+            <xsl:apply-templates select="@* | node()"/>
+        </xsl:copy>
+    </xsl:template>
+            
+    <!-- dirty hack, should better not be generated in the first place! -->
+    <xsl:template match="db:para[db:uri/text()='(Animated PDF Version)']"/>
+    
+</xsl:stylesheet>