diff --git a/dev-java/isfreetype/ChangeLog b/dev-java/isfreetype/ChangeLog
index 043fec4c..31633b99 100644
--- a/dev-java/isfreetype/ChangeLog
+++ b/dev-java/isfreetype/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  04 May 2009; Mario Fetka <mario.fetka@gmail.com>
+  isfreetype-5.0.20081218.ebuild, files/build.properties, files/build.xml:
+  corrections based on suggestiosn from Vlastimil Babka <caster@g.o>
+
   20 Apr 2009; Mario Fetka <mario.fetka@gmail.com> isfreetype-5.0.20081218:
   initial checkin
 
diff --git a/dev-java/isfreetype/Manifest b/dev-java/isfreetype/Manifest
index b2b9dfdb..cad7f846 100644
--- a/dev-java/isfreetype/Manifest
+++ b/dev-java/isfreetype/Manifest
@@ -1,6 +1,6 @@
-AUX build.properties 222 RMD160 be09f8d7da3d16d053bd38aedf805106531abb15 SHA1 45c509bbcf43e4f8d658f667413a8459815a72da SHA256 f6004b991551562109bbaa2d1b27e3b6f1fe07c4c45c84e67ae5d96b811060b2
-AUX build.xml 3496 RMD160 60aab10c5cd107fea421e5343aadeb7a35f66771 SHA1 69a2ea357e04770afce0dad05608b77b6fbc3a36 SHA256 bf9dec1706b99089e631ac15aefb0bc45c0b70db7c14e2c0d945d0522e85823c
+AUX build.properties 220 RMD160 4fc068c613fc267a31a8aefbe259668ac9864c40 SHA1 1ce6c5c120b1e098285dcce78ed15a015904b90c SHA256 34a320c7077b9d823c7eec76ced97611f5f9fea131bcb6ee6fc8121dbcad6593
+AUX build.xml 3476 RMD160 b999dbcab9f502dc7fa5297e6677f3f7372381a7 SHA1 2f60ab8da7552e37127d9a0a87985ea1eb51128b SHA256 71a38fc061d8e32a08a1269e1c047a925e6c16fecb156ae501cfe710bc3925b9
 DIST isFreetype.5.0.20081218.zip 2212393 RMD160 b16ec1b50dad16b0b248c5f3256fae32bee765e8 SHA1 be9b6d9e5a130e97be7c4eb26396a0c826fc1c76 SHA256 25ffc4cb99ee2dc07f0a8aea40d39e3a2792c7944599578f96b745d37e31c67b
-EBUILD isfreetype-5.0.20081218.ebuild 1486 RMD160 e3f0f0c07c3f8bce1a574d3df04dd29615a15abf SHA1 101124240c171fd9003609877a9edb09c6449888 SHA256 6a814ddf9989e4b7819dba3c79944a2b0c1aa23a30c63c848c020a4bd32cc504
-MISC ChangeLog 215 RMD160 acf72c6c04539e1f201ee7cad3b6fca13e53c867 SHA1 9cb546f9a3a00eae993b4ae8d0fa17ca54bb1599 SHA256 ae9951ac14bbfd59623cfc5c3bd1cc4323817de41321c91bea36d45feb6bce50
+EBUILD isfreetype-5.0.20081218.ebuild 911 RMD160 df13d82a228e49bcbf7321bec0477c84a7c8ed88 SHA1 108fd369458fccedd19943b45929f68e6b2d6c2b SHA256 7974cc8c1bae1fda8c94bdce7a8a930d714cc26bccac9cb4301a720fa25f2a9d
+MISC ChangeLog 411 RMD160 b23d96a8aa8fbd40fafcccb979a8d3f40141f43b SHA1 5856fb30eccc1669e5ef3622c0e00dddfdc0da4c SHA256 07afc5e501c0ca07e8004a5126021686b605969d4adbd394c55f9c32ed22534d
 MISC metadata.xml 159 RMD160 7da5c733c224383ffe350605bc36721a3ff2536f SHA1 99c2655c7bbee2cbc8c79edb2d00d481d62faf95 SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb
diff --git a/dev-java/isfreetype/files/build.properties b/dev-java/isfreetype/files/build.properties
index 73266634..fbe67a07 100644
--- a/dev-java/isfreetype/files/build.properties
+++ b/dev-java/isfreetype/files/build.properties
@@ -2,7 +2,7 @@
 build.dir=build
 
 #libraries
-libs.dir=lib
+libs.dir=.
 isrt.jar.name=isrt
 jna.jar.name=jna
 isnativec.jar.name=isnativec
diff --git a/dev-java/isfreetype/files/build.xml b/dev-java/isfreetype/files/build.xml
index 5c0b92b1..8e9dd43a 100644
--- a/dev-java/isfreetype/files/build.xml
+++ b/dev-java/isfreetype/files/build.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="isfreetype" default="build-jars" basedir="../">
+<project name="isfreetype" default="jar" basedir=".">
     <description>
         This is a generic native code wrapper
     </description>
@@ -10,7 +10,7 @@
   <property name="isfreetype.resource.dir" location="resource"/>
   
   <target name="init">
-  	<property file="ant/build.properties" />
+  	<property file="build.properties" />
 
 	<property name="isfreetype.build.root" location="${build.dir}/isfreetype"/>
   	<property name="isfreetype.build.dir" location="${isfreetype.build.root}/build"/>
@@ -50,7 +50,7 @@
     </javac>
   </target>
 	
-  <target name="build-jars" depends="compile" description="generate the distribution" >
+  <target name="jar" depends="compile" description="generate the distribution" >
 
     <jar jarfile="${isfreetype.dist.dir}/${isfreetype.jar.name}.jar" basedir="${isfreetype.build.dir}">
 	    <manifest>
diff --git a/dev-java/isfreetype/isfreetype-5.0.20081218.ebuild b/dev-java/isfreetype/isfreetype-5.0.20081218.ebuild
index 92cdb7ff..55bd1b62 100644
--- a/dev-java/isfreetype/isfreetype-5.0.20081218.ebuild
+++ b/dev-java/isfreetype/isfreetype-5.0.20081218.ebuild
@@ -2,7 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-JAVA_PKG_IUSE="source"
+EAPI="2"
+
+JAVA_PKG_IUSE="source doc"
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="isnativec,isrt,jna"
 
 inherit java-pkg-2 java-ant-2
 
@@ -13,11 +17,11 @@ SRC_URI="mirror://sourceforge/jpodrenderer/isFreetype.${PV}.zip"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc"
+IUSE=""
 
-COMMON_DEP="dev-java/jna
-	   dev-java/isrt
-	   dev-java/isnativec"
+COMMON_DEP="dev-java/jna:0
+	   dev-java/isrt:0
+	   dev-java/isnativec:0"
 RDEPEND=">=virtual/jre-1.5
 	${COMMON_DEP}"
 DEPEND=">=virtual/jdk-1.5
@@ -26,30 +30,8 @@ DEPEND=">=virtual/jdk-1.5
 
 S="${WORKDIR}"/distribution
 
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	mkdir ant
-	cp "${FILESDIR}/build.xml" "${S}"/ant
-
-	echo > ${S}/ant/build.properties
-	echo "build.dir=${S}/build" >> ${S}/ant/build.properties
-	echo "libs.dir=${S}" >> ${S}/ant/build.properties
-	echo "isrt.jar.name=isrt" >> ${S}/ant/build.properties
-	echo "jna.jar.name=jna" >> ${S}/ant/build.properties
-	echo "isnativec.jar.name=isnativec" >> ${S}/ant/build.properties
-	echo "isfreetype.jar.name=isfreetype" >> ${S}/ant/build.properties
-
-	java-pkg_jarfrom isnativec
-	java-pkg_jarfrom isrt
-	java-pkg_jarfrom jna
-}
-
-src_compile() {
-	eant ${antflags} -buildfile ant/build.xml || die "build failed"
-
-	use doc && eant ${antflags} -buildfile ant/build.xml javadoc || die "doc build failed"
+src_prepare() {
+	cp "${FILESDIR}"/build.* "${S}" || die
 }
 
 src_install() {