diff --git a/srcpkgs/apache-fop/template b/srcpkgs/apache-fop/template
index 1afb4f84533..2b861da4e75 100644
--- a/srcpkgs/apache-fop/template
+++ b/srcpkgs/apache-fop/template
@@ -1,54 +1,54 @@
 # Template file for 'apache-fop'
-pkgname="apache-fop"
-version="1.1"
-revision=5
-short_desc="Java print formatter driven by XSL formatting objects (XSL-FO) and an output independent formatter"
-maintainer="Carlo Dormeletti <carloDOTdormelettiATaliceDOTit>"
+pkgname=apache-fop
+version=2.0
+revision=1
+short_desc="Java print formatter driven by XSL formatting objects (XSL-FO)"
+maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="Apache-2.0"
 homepage="http://xmlgraphics.apache.org/fop/"
-distfiles="http://mirror.dkd.de/apache/xmlgraphics/fop/source/fop-${version}-src.tar.gz 
-	http://mirror.dkd.de/apache/xmlgraphics/fop/binaries/fop-${version}-bin.tar.gz"
-checksum="58164cb3298d130522ecd445b8082c71c36242ea6464c8f02ab4157e4a332522
-	0697a90c2f0b0602bf707070267caecc59638a8bf7a719d5950acff764f57b8e"
+distfiles="
+ http://mirror.dkd.de/apache/xmlgraphics/fop/source/fop-${version}-src.tar.gz 
+ http://mirror.dkd.de/apache/xmlgraphics/fop/binaries/fop-${version}-bin.tar.gz"
+checksum="
+ 1d37f2d1cfb8dd29df6765a5875042fc89c085dd7329504afd8ecce4096d0882
+ 1e90cfc9e07c2da088592860fa4651a7640c9e1e3500b71a613a5dea03eb3665"
+
 only_for_archs="i686 x86_64"
-hostmakedepends="openjdk"
-makedepends="apache-ant"
+hostmakedepends="openjdk apache-ant"
 depends="virtual?java-runtime JAI"
 wrksrc="fop-${version}"
-
 conf_files="/etc/fop.conf"
 
-do_build(){
-    export JAVA_HOME=/usr/lib/jvm/openjdk
-    ant package
+do_build() {
+	. /etc/profile.d/apache-ant.sh
+	. /etc/profile.d/10_openjdk.sh
+	ant package
 }
-
 do_install() {
-    _prefix="usr/share/fop" 
-    _docs="usr/share/doc/fop-${version}"
-    vmkdir ${_prefix}
-    vmkdir ${_docs}
-    vmkdir ${_prefix}/build
-    vcopy "build/fop*.jar" ${_prefix}/build
-    vmkdir ${_prefix}/lib
-    vcopy "lib/*" ${_prefix}/lib
-    vmkdir ${_docs}/conf
-    vcopy "conf/*" ${_docs}/conf
-    vmkdir ${_docs}/examples
-    vcopy "examples/*" ${_docs}/examples
-    vmkdir ${_docs}/javadocs
-    vcopy "javadocs/*" ${_docs}/javadocs
-    vcopy fop ${_prefix}
-    vcopy fop.js ${_prefix}
-    vcopy KEYS ${_docs}
-    vcopy LICENSE ${_docs}
-    vcopy NOTICE ${_docs}
-    vcopy README ${_docs}
-    vcopy status.xml ${_prefix}
-    vcopy ${FILESDIR}/README.void ${_docs}
-    vinstall ${FILESDIR}/fop.conf 644 etc/
-    #create a handy symlink
-    vmkdir usr/bin
-    ln -sf /usr/share/fop/fop $DESTDIR/usr/bin/fop
-}
+	local _prefix=usr/share/fop
+	local _docs=usr/share/doc/fop-${version}
 
+	vmkdir ${_prefix}
+	vmkdir ${_docs}
+	vmkdir ${_prefix}/build
+	vcopy "build/fop*.jar" ${_prefix}/build
+	vmkdir ${_prefix}/lib
+	vcopy "lib/*" ${_prefix}/lib
+	vmkdir ${_docs}/conf
+	vcopy "conf/*" ${_docs}/conf
+	vmkdir ${_docs}/examples
+	vcopy "examples/*" ${_docs}/examples
+	vmkdir ${_docs}/javadocs
+	vcopy "javadocs/*" ${_docs}/javadocs
+	vcopy fop ${_prefix}
+	vcopy fop.js ${_prefix}
+	vcopy KEYS ${_docs}
+	vcopy LICENSE ${_docs}
+	vcopy NOTICE ${_docs}
+	vcopy README ${_docs}
+	vcopy status.xml ${_prefix}
+	vcopy ${FILESDIR}/README.void ${_docs}
+	vconf ${FILESDIR}/fop.conf
+	vmkdir usr/bin
+	ln -sf /usr/share/fop/fop $DESTDIR/usr/bin/fop
+}