diff --git a/net-mail/zarafa/ChangeLog b/net-mail/zarafa/ChangeLog
index 47d3b49..3bcf485 100644
--- a/net-mail/zarafa/ChangeLog
+++ b/net-mail/zarafa/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  19 Jun 2011; Mario Fetka <mario.fetka@gmail.com> zarafa-6.40.9.27553.ebuild:
+  correct arm support
+
   19 Jun 2011; Mario Fetka <mario.fetka@gmail.com> zarafa-6.40.8.27223.ebuild,
   zarafa-6.40.9.27553.ebuild, zarafa-7.0.0.3.25734.ebuild:
   add arm support
diff --git a/net-mail/zarafa/Manifest b/net-mail/zarafa/Manifest
index c754efa..7422aa4 100644
--- a/net-mail/zarafa/Manifest
+++ b/net-mail/zarafa/Manifest
@@ -53,7 +53,7 @@ DIST zcp-7.0.0.tar.gz 5898702 RMD160 dfc0958b69ebe4931e07de50f63c236b38f08aaf SH
 DIST zcp-7.0.0beta3-25734-sles-11-i586-free.tar.gz 25242652 RMD160 8f3710fc09b0b2ca80e80ae4f3c3a041d2808b19 SHA1 d601974e823700623c0d8b3e3496b43f3dbca115 SHA256 1648c3200d9249baa50ed8d43e46f78535a643d9042a3a5d7e8bfff27aa0fc2a
 DIST zcp-7.0.0beta3-25734-sles-11-x86_64-free.tar.gz 25165278 RMD160 8925b89c1107d4530397275bfd14bf14e7ae55d9 SHA1 f4e5877ab6b47c6e2e57a805d308720842b2e24e SHA256 6d9db4530621cffc40797511fb4757f3c259a48c9f9d4a3515aefd0ec7437e4d
 EBUILD zarafa-6.40.8.27223.ebuild 6567 RMD160 83e20fc877c6d5f50d4b85f7b9d6b957c97a5e15 SHA1 7b7637509d64c46bb52e1208e553a298cbb6e939 SHA256 74ab1f9061cada56505cd39e861d348f5b9007e85fa94d3dd48c811005dc4f95
-EBUILD zarafa-6.40.9.27553.ebuild 8730 RMD160 7fdcf6d7699b038cca0a2a8c22ed67a4973ce4ad SHA1 a58bf2cc0ebd84f3a2818b891d2d234870fee44d SHA256 70e611d4b7360feef26bd7537eddd85199c8aac6e35eeeaf1083e15959b32532
+EBUILD zarafa-6.40.9.27553.ebuild 8772 RMD160 b93c8246ab0150529dbfe4400bd6c9f9f396a7d0 SHA1 4c983d6e7af343372494ae6f3dbaaa4d5d14f51a SHA256 f7c33ad460b73677daa7e00fdfcb0e1321010e2fe93283776eef3c7f2dcb3af3
 EBUILD zarafa-7.0.0.3.25734.ebuild 6771 RMD160 9923dce5531900ea87cdc3e45ba7a04a85d104b5 SHA1 72fb520c61c5c607fe604578c2c5b14913a05e35 SHA256 e59fd928c329e5f380246f525c1422736a27a7e03613a538097386b579c5e311
-MISC ChangeLog 6699 RMD160 cf53cff8334b174f6fb9268a7fb98ac3e09d43d4 SHA1 f247d13c9c84aef0ab0d96b1fdf1a3851d41103c SHA256 efb3910d7b8a2f13954ddbb4598ef58751fb078044c1f6489b11d9801979f4a7
+MISC ChangeLog 6801 RMD160 495fafc36026f5a53f220fe13827cbdebfb163a4 SHA1 a9568909c333eb457bf8c1fdc9c43bb7ae841932 SHA256 7568c85ee36b1466a5d96604a4d96bf594a2425e59f30d48e762dacdc924b01c
 MISC metadata.xml 1238 RMD160 c82938e77f387291d6a1c3bf9b0d802f2878dd12 SHA1 b5738f14922c69e78cfb867acdc65eeea25977bf SHA256 2c13f98be5fa8bdaf21ac86bcd00bbeb8944df5615de0cfce35ae4c00ef4b4d5
diff --git a/net-mail/zarafa/zarafa-6.40.9.27553.ebuild b/net-mail/zarafa/zarafa-6.40.9.27553.ebuild
index f3cb153..871d4c6 100644
--- a/net-mail/zarafa/zarafa-6.40.9.27553.ebuild
+++ b/net-mail/zarafa/zarafa-6.40.9.27553.ebuild
@@ -36,7 +36,7 @@ LICENSE="AGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
 RESTRICT=""
-IUSE="debug epoll ldap logrotate x86? ( licensed ) amd64? ( licensed ) static swig tcmalloc testtools perl pic profiling python kerberos sparsehash bash-completion smime dspam google-maps themes mobile-device"
+IUSE="debug epoll ldap logrotate licensed static swig tcmalloc testtools perl pic profiling python kerberos sparsehash bash-completion smime dspam google-maps themes mobile-device"
 
 RDEPEND=">=dev-libs/libical-0.44
 	dev-cpp/libvmime:0.7
@@ -177,21 +177,23 @@ src_install() {
 	dodir /var/log/zarafa
 	keepdir /var/log/zarafa
 
-	if use licensed; then
-		dobin "${WORKDIR}"/licensed/usr/bin/* || die "Failed to install licensed binaries"
-		exeinto /usr/$(get_libdir)/zarafa/
-		doexe "${WORKDIR}"/licensed/usr/$(get_libdir)/zarafa/*.so || die "Failed to install licensed lib"
-		doman "${WORKDIR}"/licensed/usr/share/man/*/*.gz || die "Failed to install man files"
-		exeinto /usr/share/zarafa/zarafa-backup-helpers/
-		doexe "${WORKDIR}"/licensed/usr/share/zarafa/zarafa-backup-helpers/* || die "Failed to install helper scripts"
-		dodoc "${WORKDIR}"/licensed/usr/share/doc/packages/zarafa-licensed/* || die "Failed to install docs"
-		insinto /etc/zarafa
-		doins -r "${WORKDIR}"/licensed/etc/zarafa/* || die "Failed to install config files"
-		insinto /etc/cron.d
-		doins "${WORKDIR}"/licensed/etc/cron.d/* || die "Failed to install cron files"
-#		insinto /usr/share/zarafa-webaccess/
-#		doins -r "${WORKDIR}"/licensed/usr/share/zarafa-webaccess/* || die "Failed to install webapp files"
-		newinitd "${FILESDIR}"/zarafa-licensed.rc6 zarafa-licensed || die "Failed to install init.d files"
+	if [ ${ARCH} = "x86" || ${ARCH} = "amd64" ]; then
+		if use licensed; then
+			dobin "${WORKDIR}"/licensed/usr/bin/* || die "Failed to install licensed binaries"
+			exeinto /usr/$(get_libdir)/zarafa/
+			doexe "${WORKDIR}"/licensed/usr/$(get_libdir)/zarafa/*.so || die "Failed to install licensed lib"
+			doman "${WORKDIR}"/licensed/usr/share/man/*/*.gz || die "Failed to install man files"
+			exeinto /usr/share/zarafa/zarafa-backup-helpers/
+			doexe "${WORKDIR}"/licensed/usr/share/zarafa/zarafa-backup-helpers/* || die "Failed to install helper scripts"
+			dodoc "${WORKDIR}"/licensed/usr/share/doc/packages/zarafa-licensed/* || die "Failed to install docs"
+			insinto /etc/zarafa
+			doins -r "${WORKDIR}"/licensed/etc/zarafa/* || die "Failed to install config files"
+			insinto /etc/cron.d
+			doins "${WORKDIR}"/licensed/etc/cron.d/* || die "Failed to install cron files"
+#			insinto /usr/share/zarafa-webaccess/
+#			doins -r "${WORKDIR}"/licensed/usr/share/zarafa-webaccess/* || die "Failed to install webapp files"
+			newinitd "${FILESDIR}"/zarafa-licensed.rc6 zarafa-licensed || die "Failed to install init.d files"
+		fi
 	fi
 
 	if use bash-completion; then