diff --git a/dev-java/ehcache/ehcache-1.2.4-r4.ebuild b/dev-java/ehcache/ehcache-1.2.4-r4.ebuild
index d6477b931e02b..679a03610b6a0 100644
--- a/dev-java/ehcache/ehcache-1.2.4-r4.ebuild
+++ b/dev-java/ehcache/ehcache-1.2.4-r4.ebuild
@@ -27,15 +27,10 @@ DEPEND=">=virtual/jdk-1.6
 	app-arch/unzip"
 
 S="${WORKDIR}/${P}"
-
-JAVA_PKG_WANT_SOURCE="1.7"
-JAVA_PKG_WANT_TARGET="1.7"
-JAVA_SRC_DIR="src"
-
 JAVA_GENTOO_CLASSPATH="commons-collections,commons-logging,servlet-api-2.5"
 
 java_prepare() {
-	unzip -d src ${P}-sources.jar || die
-	rm -rf src/net/sf/ehcache/hibernate || die
-	rm *.jar || die
+	unpack ./${P}-sources.jar
+	rm -vr net/sf/ehcache/hibernate || die
+	java-pkg_clean
 }