3 files changed, 4 insertions, 4 deletions
diff --git a/docs/xml-docs/build.xml b/docs/xml-docs/build.xml
index 8be735c05..b66a9310f 100644
--- a/docs/xml-docs/build.xml
+++ b/docs/xml-docs/build.xml
@@ -27,8 +27,8 @@ These are the meaningful targets for this build file:
     <property name="outfile.fo" value="fop.fo"/>
     <property name="outfile.pdf" value="fop.pdf"/>
 
-    <taskdef name="fop" classname="Fop"/>
-    <taskdef name="xslt" classname="Xslt"/>
+    <taskdef name="fop" classname="org.apache.fop.tools.anttasks.Fop"/>
+    <taskdef name="xslt" classname="org.apache.fop.tools.anttasks.Xslt"/>
 
   </target>
 
diff --git a/docs/xml-docs/makedoc.bat b/docs/xml-docs/makedoc.bat
index eac7a1ac3..45b36ba72 100755
--- a/docs/xml-docs/makedoc.bat
+++ b/docs/xml-docs/makedoc.bat
@@ -6,7 +6,7 @@ echo ----------------
 
 if "%JAVA_HOME%" == "" goto error
 
-set LOCALCLASSPATH=%JAVA_HOME%\lib\tools.jar;%JAVA_HOME%\lib\classes.zip;..\..\lib\ant.jar;..\..\lib\xml.jar;..\..\lib\w3c.jar;..\..\lib;..\..\build\fop.jar;..\..\lib\stylebook.jar
+set LOCALCLASSPATH=%JAVA_HOME%\lib\tools.jar;%JAVA_HOME%\lib\classes.zip;..\..\lib\ant.jar;..\..\lib\xml.jar;..\..\lib\w3c.jar;..\..\lib\buildtools.jar;..\..\build\fop.jar;..\..\lib\stylebook.jar
 set ANT_HOME=.\lib
 
 
diff --git a/docs/xml-docs/makedoc.sh b/docs/xml-docs/makedoc.sh
index 92b813171..e3859e399 100755
--- a/docs/xml-docs/makedoc.sh
+++ b/docs/xml-docs/makedoc.sh
@@ -13,7 +13,7 @@ if [ "$JAVA_HOME" = "" ] ; then
   exit 1
 fi
 
-LOCALCLASSPATH=$JAVA_HOME/lib/tools.jar:$JAVA_HOME/lib/classes.zip:../../lib/ant.jar:../../lib/xml.jar:../../lib/w3c.jar:../../lib:../../build/fop.jar:../../lib\stylebook.jar
+LOCALCLASSPATH=$JAVA_HOME/lib/tools.jar:$JAVA_HOME/lib/classes.zip:../../lib/ant.jar:../../lib/xml.jar:../../lib/w3c.jar:../../lib/buildtools.jar:../../build/fop.jar:../../lib\stylebook.jar
 ANT_HOME=../../lib
 
 echo Building with classpath $CLASSPATH:$LOCALCLASSPATH