diff --git a/Doc/Makefile b/Doc/Makefile
index 5b9b08eb433fb2758e44c8bcd44457284169e090..f74fa6fc6321ad2709c433e9776c4ac9bdec99d4 100644
--- a/Doc/Makefile
+++ b/Doc/Makefile
@@ -26,13 +26,8 @@ jdoc:
          -link http://docs.oracle.com/javase/7/docs/api -link http://testng.org/javadocs -link http://docs.oracle.com/javaee/6/api -link http://www.jdom.org/docs/apidocs \
          `find . -name \*.java|grep -v \.metadata`
 
-#jdoc:
-#	cd ../ws/eclipse;javadoc \
-#-classpath /usr/share/java/testng.jar:/usr/share/java/jdom-2.0.4.jar:${M2HOME}/org/hibernate/hibernate-core/4.1.9.Final/hibernate-core-4.1.9.Final.jar:${M2HOME}/org#/jboss/spec/javax/transaction/jboss-transaction-api_1.1_spec/1.0.0.Final/jboss-transaction-api_1.1_spec-1.0.0.Final.jar:${M2HOME}/org/hibernate/javax/persistence/hi#bernate-jpa-2.0-api/1.0.1.Final/hibernate-jpa-2.0-api-1.0.1.Final.jar:/ma/goik/workspace/GoikLectures/ws/eclipse/Jdbc/lib/commons-codec-1.5.jar -d ${BUILDNAVI}/Ref/#api -linksource \
-#         -link http://docs.oracle.com/javase/7/docs/api -link http://testng.org/javadocs -link http://docs.oracle.com/javaee/6/api -link http://www.jdom.org/docs/ap#idocs \
-#         `find . -name \*.java|grep -v \.metadata`
 
-${BUILDNAVI}/index.html ${BUILDNAVI}/printversion.pdf:${SCRIPTBASENAME}.xml
+${BUILDNAVI}/index.html ${BUILDNAVI}/printversion.pdf:${SCRIPTBASENAME}.xml jdoc
 	rm -rf $(BUILDBASE) || true
 	mkdir -p ${BUILDNAVI} ${BUILDNONAVI}
 	java -cp  ${CP} de.hdm_stuttgart.mi.codeformat.Docbook2docbook ${SCRIPTBASENAME}
@@ -44,8 +39,6 @@ ${BUILDNAVI}/index.html ${BUILDNAVI}/printversion.pdf:${SCRIPTBASENAME}.xml
 	cd Ref/Fig;make all
 	/usr/share/xmlmind/bin/convertdoc -p eclipse.plugin.id  $(PLUGINID) ${PPARAM} db5.toEclipseHelp  ${SCRIPTBASENAME}.convert.answer.xml -u $(BUILDNAVI)
 	perl -i -p -e '$$/=undef;s/\n[ \t]*<!DOCTYPE[^>]+\n[^>]*>$$//m' ${BUILDNAVI}/*.xml ${BUILDNONAVI}/*.xml
-	cd ../ws/eclipse/Jdbc;javadoc -classpath /usr/share/java/testng.jar -d ${BUILDNAVI}/Ref/api -linksource \
-         -link http://docs.oracle.com/javase/7/docs/api -link http://testng.org/javadocs `find . -name \*.java`
 	/usr/share/xmlmind/bin/convertdoc db5.toPSFile  ${SCRIPTBASENAME}.convert.answer.xml \
                 -s pdf -s "|pdf" -u  $(BUILDNAVI)/printversion.pdf
 #	j2h -d  ${BUILDNAVI}/src/classes -js ~/workspace/StructuredData/ws/eclipse/Jdbc/src \