diff --git a/ws/Docbook/Extensions/Tdata/Makefile b/ws/Docbook/Extensions/Tdata/Makefile
index 8636fd9c38d9b2994d43a1f59a17c6139ed445bf..1d24594cc040bea6f669dd302b1e3ee49608eab8 100644
--- a/ws/Docbook/Extensions/Tdata/Makefile
+++ b/ws/Docbook/Extensions/Tdata/Makefile
@@ -1,12 +1,12 @@
-PLUGINID=de.hdm_stuttgart.mi.fig
+DESTDIR=webhelp
+TARGETDIR=/tmp/$(DESTDIR)
+WEBHELPXSL=/usr/share/xmlmind/addon/config/docbook5/xslCustom/webhelpHdm.xsl
 
-XSLPARAM=-p callout.graphics 0 \
--p callout.unicode 1
+LECTUREDIR=lectures
+XSLTESTDIR=xsltest
 
-XSLPARAM_html=-p use.extensions 1 \
- -p eclipse.plugin.name Lectures  \
- -p eclipse.plugin.id $(PLUGINID)  \
- -p eclipse.plugin.provider 'Martin Goik, goik@hdm-stuttgart.de'
+# Invoke with debugging option like e.g.:
+#   make DEBUG='-d -vvv' webhelp
 
 XSLPARAM_pdf=-p xep.extensions 1\
  -p highlight.source 1 
@@ -15,47 +15,27 @@ XSLPARAM_pdf=-p xep.extensions 1\
 # -p ulink.footnotes 1
 #
 
-BUILDNAVI=/tmp/$(PLUGINID)
+all: epub webhelp pdf
 
-all: eclipsehelp epub
-
-
-help: help.html help.pdf
-webhelp:help.pdf webhelp.html
-
-help.html:fig.xml
-	/usr/share/xmlmind/bin/xxetool convert -d -vvv ${XSLPARAM} ${XSLPARAM_html} \
-           db5.toEclipseHelp fig.xml -u $(BUILDNAVI)
+epub:
+	/usr/share/xmlmind/bin/xxetool convert $(DEBUG) db5.toEpub  fig.xml -u $(TARGETDIR)/fig.epub
 
-webhelp.html:fig.xml
-	/usr/share/xmlmind/bin/xxetool convert -d -vvv ${XSLPARAM} ${XSLPARAM_html} \
-           db5.toWebHelp fig.xml -u $(BUILDNAVI)
+webhelp:fig.xml
+	/usr/share/xmlmind/bin/xxetool convert $(DEBUG)  \
+           db5.toWebHelp fig.xml -u $(TARGETDIR)
 
-help.pdf: fig.xml
-	/usr/share/xmlmind/bin/xxetool convert -d -vvv ${XSLPARAM} ${XSLPARAM_pdf} \
+pdf: fig.xml
+	/usr/share/xmlmind/bin/xxetool convert $(DEBUG) ${XSLPARAM_pdf} \
           db5.toPSFile fig.xml \
-          -s pdf -s "|pdf" -u  $(BUILDNAVI)/printversion.pdf
+          -s pdf -s "|pdf" -u  $(TARGETDIR)/printversion.pdf
 xsl:
-	rm -rf xsltest;mkdir xsltest
-	cd xsltest; saxon-xslt ../fig.xml ../../../docbook-xsl-ns-1.79.0/eclipse/eclipse3.xsl \
-           eclipse.plugin.name=Figures \
-           eclipse.plugin.id=de.hdm_stuttgart.mi.fig \
-           eclipse.plugin.provider='Martin Goik, goik@hdm-stuttgart.de' \
-           use.id.as.filename=1
+	rm -rf  $(XSLTESTDIR); mkdir $(XSLTESTDIR)
+	cd $(XSLTESTDIR); saxon-xslt ../fig.xml /usr/share/xmlmind/addon/config/docbook5/xslCustom/webhelpHdm.xsl
 
 lectures:
-	rm -rf de.hdm_stuttgart.mi.lectures;mkdir de.hdm_stuttgart.mi.lectures
-	cd de.hdm_stuttgart.mi.lectures; saxon-xslt ../../../../../Doc/target/lectures.xml ../../../docbook-xsl-ns-1.79.0/eclipse/eclipse3.xsl \
-           eclipse.plugin.name=Lectures \
-           eclipse.plugin.id=de.hdm_stuttgart.mi.lectures \
-           eclipse.plugin.provider='Martin Goik, goik@hdm-stuttgart.de' \
-           use.id.as.filename=1
-
-
-epub:
-	/usr/share/xmlmind/bin/xxetool convert -d -vvv  db5.toEpub  fig.xml -u  /tmp/fig.epub
+	rm -rf $(LECTUREDIR);mkdir $(LECTUREDIR)
+	cd $(LECTUREDIR); saxon-xslt ../../../../../Doc/target/lectures.xml $(WEBHELPXSL)
 
 clean:
-	cd /tmp; rm -rf xxe* de.hdm_stuttgart.mi.fig fig.epub fig fig.epub
-	rm -rf de.hdm_stuttgart.mi.lectures xsltest
+	rm -rf $(TARGETDIR) $(DESTDIR) $(LECTUREDIR) $(XSLTESTDIR)
 #end