--- m4/docbook.m4	2008-11-23 20:06:45.000000000 +1100
+++ m4/docbook.m4.new	2008-11-23 20:07:18.000000000 +1100
@@ -25,7 +25,7 @@
 		AC_MSG_ERROR([Could not find the Docbook root directory. If you have installed it on your system and we haven't been able to find it. Please report a bug])
 	fi
 	# xml.apache.org SVG Library
-	AC_JAVA_CHECK_PACKAGE([batik],[org.apache.batik.parser.Parser],[Apache SVG Library])
+	AC_JAVA_CHECK_PACKAGE([batik-all],[org.apache.batik.parser.Parser],[Apache SVG Library])
 	BATIK=$PACKAGE_JAR_FILE
 	AC_SUBST(BATIK)
 
@@ -39,13 +39,9 @@
 	FOP=$PACKAGE_JAR_FILE
 	AC_SUBST(FOP)
 
-	# MathML rendering solution
-	AC_JAVA_CHECK_PACKAGE([jeuclid-core],[net.sourceforge.jeuclid.MathBase],[MathML rendering solution])
-	JEUCLID_CORE=$PACKAGE_JAR_FILE
-	AC_SUBST(JEUCLID_CORE)
 
 	# Commons I/O library
-	AC_JAVA_CHECK_PACKAGE([commons-io],[org.apache.commons.io.output.CountingOutputStream],[Commons I/O library])
+	AC_JAVA_CHECK_PACKAGE([jakarta-commons-io],[org.apache.commons.io.output.CountingOutputStream],[Commons I/O library])
 	COMMONS_IO=$PACKAGE_JAR_FILE
 	AC_SUBST(COMMONS_IO)
 
@@ -61,6 +57,10 @@
 	AC_SUBST(AVALON_FRAMEWORK)
 	
 
+	# MathML rendering solution
+	AC_JAVA_CHECK_PACKAGE([jeuclid-core],[net.sourceforge.jeuclid.MathBase],[MathML rendering solution])
+	JEUCLID_CORE=$PACKAGE_JAR_FILE
+	AC_SUBST(JEUCLID_CORE)
 AC_SUBST(DOCBOOK_ROOT)
 
 ])

@@ -62,7 +62,7 @@
 	AC_SUBST(XMLGRAPHICS_COMMONS)
 
 	# XML API EXT (conversion of a SVG => PNG)
-	AC_JAVA_CHECK_PACKAGE([xml-apis-ext],[org.w3c.dom.svg.SVGDocument],[XML Commons external code])
+	AC_JAVA_CHECK_PACKAGE([xml-commons-apis-ext],[org.w3c.dom.svg.SVGDocument],[XML Commons external code])
 	XML_APIS_EXT=$PACKAGE_JAR_FILE
 	AC_SUBST(XML_APIS_EXT)