diff --git a/dev-java/jPod/ChangeLog b/dev-java/jPod/ChangeLog
index e54060cc..84ecefc9 100644
--- a/dev-java/jPod/ChangeLog
+++ b/dev-java/jPod/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> jPod-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> ChangeLog:
   initial checkin
 
diff --git a/dev-java/jPod/Manifest b/dev-java/jPod/Manifest
index 4f083d1d..7abd1d99 100644
--- a/dev-java/jPod/Manifest
+++ b/dev-java/jPod/Manifest
@@ -1,6 +1,6 @@
-AUX build.properties 206 RMD160 c1af7d5c00ba121595c480ed69b1d46d599ded0f SHA1 615484e4d408d6bdc8e72511b1fa927633abcbf8 SHA256 ea963899bb772587a3bbf9321d5b26e440886c975bf7cd25c3729a47884b1326
-AUX build.xml 3290 RMD160 a30cbc77cee91d16ade6405b2215ad06fd4b99f0 SHA1 cfe7c400f40c9a09a559ec77fc20c9ea264d68a3 SHA256 7d3c8b5d814aca06c6069ca1ca01a402b14d200c66096367bebb176554f4fd6c
+AUX build.properties 204 RMD160 39aca3693f85920e7e1f8da5044d6196bafa1559 SHA1 388d85afe2cb5817b6e24ecaf3b7d009d7144288 SHA256 e0a4f9512ae340db22a12956f98ed420c3b142987a421b0b959cf6ed3e336e24
+AUX build.xml 3270 RMD160 551d509b8b9d62a284b9aa841551512a116c1963 SHA1 4b1b7c83274861d711fe99393dc7516f060f0a36 SHA256 4d90a96ef55f8ce0be097c31030f2075b95ecfcc74edec306349759ddfeb9d8c
 DIST jPod.5.0.20081218.zip 5816607 RMD160 15bef11c265487cd2257e362e7471f9acef45543 SHA1 3e2c87c270d3bc38ad4a4aa84218b7e899eb1100 SHA256 f0cd425f7f52ad2365497774b68c8a2b2edf44cd3587d9e30f408f368848a815
-EBUILD jPod-5.0.20081218.ebuild 1464 RMD160 1add674e22482102aeffd9241b92b1f662613076 SHA1 b15bca4252e7075adc57ec9d8637142ec929b0e4 SHA256 65b2fa48c341d8a12ebb95906be61f922a1e35539284a38a8edfc4db1d4567da
-MISC ChangeLog 195 RMD160 3d3c73a0133af5f05d9c622ed57cdff6926f87ef SHA1 a57de71dc04691d756567992b27ea1addab0f9f8 SHA256 027371f40585cb9b4c3d2bf1eee25d372cd3cc862caa2a4db70557d5bbc60085
+EBUILD jPod-5.0.20081218.ebuild 904 RMD160 00d4d73434f0e35a791a03615bb78f9217f0fd42 SHA1 6ebfbc733f60fa0f150c2e0b208b3064048626ec SHA256 10bb92e2fe7a29ff2debaeaaf63a6754c0b0ce81442a3a44ae2df713b1c3e463
+MISC ChangeLog 385 RMD160 3e7a9d689dc42c79969fc4f9c3a791f95b1711e4 SHA1 75ca4e619e69527b95e897886c4a94a3c1a74bd6 SHA256 b9bd5f3fe9a08d0bb24752089feff47c8509ffbe31f6e200be0697871aca5c46
 MISC metadata.xml 159 RMD160 7da5c733c224383ffe350605bc36721a3ff2536f SHA1 99c2655c7bbee2cbc8c79edb2d00d481d62faf95 SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb
diff --git a/dev-java/jPod/files/build.properties b/dev-java/jPod/files/build.properties
index 347ccc97..24a67748 100644
--- a/dev-java/jPod/files/build.properties
+++ b/dev-java/jPod/files/build.properties
@@ -2,7 +2,7 @@
 build.dir=build
 
 #libraries
-libs.dir=lib
+libs.dir=.
 jbig2.jar.name=jbig2
 isrt.jar.name=isrt
 iscwt.jar.name=iscwt
diff --git a/dev-java/jPod/files/build.xml b/dev-java/jPod/files/build.xml
index 4034796e..d2344f24 100644
--- a/dev-java/jPod/files/build.xml
+++ b/dev-java/jPod/files/build.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="jPod" default="build-jars" basedir="../">
+<project name="jPod" default="jar" basedir=".">
     <description>
         This is a window toolkit and basic rendering abstraction layer
     </description>
@@ -10,7 +10,7 @@
   <property name="jPod.resource.dir" location="resource"/>
   
   <target name="init">
-  	<property file="ant/build.properties" />
+  	<property file="build.properties" />
 
 	<property name="jPod.build.root" location="${build.dir}/jPod"/>
   	<property name="jPod.build.dir" location="${jPod.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="${jPod.dist.dir}/${jPod.jar.name}.jar" basedir="${jPod.build.dir}">
 	    <manifest>
diff --git a/dev-java/jPod/jPod-5.0.20081218.ebuild b/dev-java/jPod/jPod-5.0.20081218.ebuild
index 43462e16..1994b394 100644
--- a/dev-java/jPod/jPod-5.0.20081218.ebuild
+++ b/dev-java/jPod/jPod-5.0.20081218.ebuild
@@ -2,7 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+EAPI="2"
+
 JAVA_PKG_IUSE="source"
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="jbig2,iscwt,isrt"
 
 inherit java-pkg-2 java-ant-2
 
@@ -15,9 +19,9 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc"
 
-COMMON_DEP="dev-java/isrt
-	    dev-java/jbig2
-	    dev-java/iscwt"
+COMMON_DEP="dev-java/isrt:0
+	    dev-java/jbig2:0
+	    dev-java/iscwt: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 "jbig2.jar.name=jbig2" >> ${S}/ant/build.properties
-	echo "isrt.jar.name=isrt" >> ${S}/ant/build.properties
-	echo "iscwt.jar.name=iscwt" >> ${S}/ant/build.properties
-	echo "jPod.jar.name=jPod" >> ${S}/ant/build.properties
-
-	java-pkg_jarfrom isrt
-	java-pkg_jarfrom iscwt
-	java-pkg_jarfrom jbig2
-}
-
-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() {