diff --git a/eclass/rpm5.eclass b/eclass/rpm5.eclass
index 6fe20a7..8a7f884 100644
--- a/eclass/rpm5.eclass
+++ b/eclass/rpm5.eclass
@@ -30,7 +30,7 @@ rpm5_unpack() {
 			a="${DISTDIR}/${a}"
 		fi
 #		rpm2tar -O "${a}" | tar xf - || die "failure unpacking ${a}"
-		rpmoff=`rpm5offset < ${rpmfile}`
+		rpmoff=`rpm5offset < ${a}`
 		[ -z "${rpmoff}" ] && return 1
 
 		decompcmd="lzma -dc"
diff --git a/www-apps/zarafa/Manifest b/www-apps/zarafa/Manifest
index 2400877..d0af525 100644
--- a/www-apps/zarafa/Manifest
+++ b/www-apps/zarafa/Manifest
@@ -16,6 +16,6 @@ AUX zarafa.logrotate 1857 RMD160 d295f5307be6577d3f8fdc89edc7995adae2fd47 SHA1 7
 DIST zarafa-6.40.2-sles11-i586.tar.gz 33437198 RMD160 7fb143fe435a4bf08d1ce8b292388e6d21cb27e1 SHA1 4413d70a5a4d38cd982932caa339d840201ca56d SHA256 28f312275483ad69aa6dd4f120d1b0f96438f3096642d5611be59835e6f34d8e
 DIST zarafa-6.40.2-sles11-x86_64.tar.gz 33495754 RMD160 d13b1ba2ec8ac21605baac4fb473b6dfa7c33e92 SHA1 98b82ba0343b0eab734cb4c528c869f4133a878e SHA256 b8a0c09c44b22bdfedd146cf79cc2327c95f6c13d3d08bcdfbf25409e363d2a9
 DIST zarafa-6.40.2.tar.gz 4605538 RMD160 9da243c0d7f5b9e86a5606482a1728b1056dde89 SHA1 3554a6f6cc2f32ee30f628598eb2d5de09fe5f1d SHA256 3ad4598cc6943e7e99d3d8340916dc425db1c54ed76c66a309183cb53b838350
-EBUILD zarafa-6.40.2.ebuild 4024 RMD160 2085e898054074c33115d997be57e9a8ae2b4a2a SHA1 ad12760ebbca30f150be9b91faf4c80b727c8b2c SHA256 9557f972ce1dde1c2ca7b21c25a891c51f9e95ffc7cfeef5db65e2f147ced27a
+EBUILD zarafa-6.40.2.ebuild 4027 RMD160 3b5b9faba59cb6a94896be48184c50d0a402d2ab SHA1 0a72334dab8b4c7b8ddaa5b5b09fcb9959dffe3a SHA256 1d39d13f0f64225e29ed8f790335779df2195540cf736b4849fdcc53bbb18906
 MISC ChangeLog 462 RMD160 679b139915ff212ecd25cc408eb091b8703dcd59 SHA1 e655896faf5f7a31915e99cdaf8e8763997939a9 SHA256 ba3c15083b4d654f4631319c575b1a80172ae4e209b4ee86674f822b0ddd213e
 MISC metadata.xml 1238 RMD160 c82938e77f387291d6a1c3bf9b0d802f2878dd12 SHA1 b5738f14922c69e78cfb867acdc65eeea25977bf SHA256 2c13f98be5fa8bdaf21ac86bcd00bbeb8944df5615de0cfce35ae4c00ef4b4d5
diff --git a/www-apps/zarafa/zarafa-6.40.2.ebuild b/www-apps/zarafa/zarafa-6.40.2.ebuild
index 739b18b..8a416f1 100644
--- a/www-apps/zarafa/zarafa-6.40.2.ebuild
+++ b/www-apps/zarafa/zarafa-6.40.2.ebuild
@@ -8,7 +8,7 @@ PHP_EXT_NAME="mapi"
 PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="no"
 
-inherit eutils php-ext-base-r1 autotools rpm
+inherit eutils php-ext-base-r1 autotools rpm5
 
 DESCRIPTION="Open Source Groupware Solution"
 HOMEPAGE="http://zarafa.com/"
@@ -51,10 +51,10 @@ src_unpack() {
 		mkdir licensed
 		cd licensed
 		if use x86; then
-			rpm_unpack $(find ./../zarafa-${PV}-sles11-i586 -name "zarafa-licensed*")
+			rpm5_unpack $(find ./../zarafa-${PV}-sles11-i586 -name "zarafa-licensed*")
 		fi
 		if use amd64; then
-			rpm_unpack $(find ./../zarafa-${PV}-sles11-x86_64 -name "zarafa-licensed*")
+			rpm5_unpack $(find ./../zarafa-${PV}-sles11-x86_64 -name "zarafa-licensed*")
 		fi
 		cd "${S}"
 	fi