diff --git a/net-mail/zarafa/ChangeLog b/net-mail/zarafa/ChangeLog
index 2f476cb..231d044 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: $
 
+  08 Jun 2011; Mario Fetka <mario.fetka@gmail.com> zarafa-6.40.8.27223.ebuild:
+  drop arm support
+
   08 Jun 2011; Mario Fetka <mario.fetka@gmail.com>
   +files/6.40.8.27223/Datux-sendas.patch, zarafa-6.40.8.27223.ebuild,
   +files/6.40.8.27223/Datux-spamhook.patch, +files/junklearn.dspam:
diff --git a/net-mail/zarafa/Manifest b/net-mail/zarafa/Manifest
index ab0943e..c4a4f21 100644
--- a/net-mail/zarafa/Manifest
+++ b/net-mail/zarafa/Manifest
@@ -69,7 +69,7 @@ DIST zcp-source-6.40.5-24860.tgz 7075378 RMD160 1d350cb5dd0df326f3c96ace088f8a40
 EBUILD zarafa-6.40.5.24860.ebuild 6477 RMD160 8eaabfabf480dc46d5eac5e237951c1bc75bff9f SHA1 cc05fa3a7ac388c250f5f7935c08ab51a1597961 SHA256 b296f4d589b2b0d8ae64aff1bfe37a98d316d2d659af802d9b316a2c0986028b
 EBUILD zarafa-6.40.6.25584.ebuild 6723 RMD160 72550113d78f6864caa8122ffeb08bb3c79412b3 SHA1 76ffb4521e5465ad31af130d1d332212f4835cae SHA256 42dcf7aa4750b6bf7e8574f7894441bac4595371462c57371be9c0800083bba9
 EBUILD zarafa-6.40.7.26119.ebuild 6777 RMD160 fe359cd63aca023aa83fad9a95abe0239b732a82 SHA1 6f343990be1fba33e2e06fa08f52ff57a4f47f7c SHA256 03b75c59a78e6afdbac9e8be7ef683cb42b7346e3879756057951c2f8ad38fdc
-EBUILD zarafa-6.40.8.27223.ebuild 6876 RMD160 f7bed3f7e0966f9c7d5ec2df5bd2a7ccc289516d SHA1 c46fa293266f24fc96545bfd7c5f26790287aa0b SHA256 ac14b86a94ce8807c9a319200d885cce74df90ad4ac9e05bf2ef91baf13d0332
+EBUILD zarafa-6.40.8.27223.ebuild 6783 RMD160 5f4425d95a22e304433ae8189ea5250673f42c8e SHA1 0784fb58a132211e11aa4c7f48bc59b7c4486d1f SHA256 1201f145a7acaede5bd5e84483487d0b5ce59a4e8cebc2ba7141e27e45172ba0
 EBUILD zarafa-7.0.0.3.25734.ebuild 6767 RMD160 7cfdab79030913daa2f8c64114a25db32dbda881 SHA1 b159c7d13e2b7f50a8aa9e5e0f7b730b25b422f8 SHA256 a51e0f2b582e03f2f3d755cbf0ae3aded472edacd614fbfbedb758e34f8e1ec7
-MISC ChangeLog 4390 RMD160 a9f5e75e3fd9349a33ac300745648c2aee49eff8 SHA1 24a761a9a8aa7b9c2ecd73c56c53c8f76d85e83d SHA256 aa19c361375d20eec47969171196f6c6488e1b73f33b09e402c3d09899b293c8
+MISC ChangeLog 4489 RMD160 8396d7da57e829a800e0cd5cd1d5e546ff58dc06 SHA1 b378a213f07ec6d4f3f0b0e6e7a52bd96c0965c9 SHA256 847b859a762a152d175683af7ff325528b6c634e06f984880caaa99b7ee12cd9
 MISC metadata.xml 1238 RMD160 c82938e77f387291d6a1c3bf9b0d802f2878dd12 SHA1 b5738f14922c69e78cfb867acdc65eeea25977bf SHA256 2c13f98be5fa8bdaf21ac86bcd00bbeb8944df5615de0cfce35ae4c00ef4b4d5
diff --git a/net-mail/zarafa/zarafa-6.40.8.27223.ebuild b/net-mail/zarafa/zarafa-6.40.8.27223.ebuild
index de63799..cb66791 100644
--- a/net-mail/zarafa/zarafa-6.40.8.27223.ebuild
+++ b/net-mail/zarafa/zarafa-6.40.8.27223.ebuild
@@ -19,13 +19,13 @@ MY_PVR=$(get_version_component_range 1-3 )
 DESCRIPTION="Open Source Groupware Solution"
 HOMEPAGE="http://zarafa.com/"
 SRC_URI="http://download.zarafa.com/community/final/${MY_PVM}/${MY_PV}/sourcecode/zcp-${MY_PVR}.tar.gz
-	!arm? ( licensed? (
+	licensed? (
 	amd64? ( http://download.zarafa.com/community/final/${MY_PVM}/${MY_PV}/zcp-${MY_PV}-sles-11-x86_64-free.tar.gz )
-	x86? ( http://download.zarafa.com/community/final/${MY_PVM}/${MY_PV}/zcp-${MY_PV}-sles-11-i586-free.tar.gz ) ) )"
+	x86? ( http://download.zarafa.com/community/final/${MY_PVM}/${MY_PV}/zcp-${MY_PV}-sles-11-i586-free.tar.gz ) )"
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~x86"
 RESTRICT=""
 IUSE="debug epoll ldap logrotate licensed static swig tcmalloc testtools perl pic profiling python kerberos sparsehash"
 
@@ -82,21 +82,19 @@ QA_DT_HASH="
 
 src_unpack() {
 	unpack ${A}
-	if ! use arm; then
-		if use licensed; then
-			cd "${WORKDIR}"
-			mkdir licensed
-			cd licensed
-			if use x86; then
-				rpm5_unpack $(find ./../ -name "zarafa-licensed*")
-#				rpm5_unpack $(find ./../ -name "zarafa-webaccess-muc*")
-			fi
-			if use amd64; then
-				rpm5_unpack $(find ./../ -name "zarafa-licensed*")
-#				rpm5_unpack $(find ./../ -name "zarafa-webaccess-muc*")
-			fi
-			cd "${S}"
+	if use licensed; then
+		cd "${WORKDIR}"
+		mkdir licensed
+		cd licensed
+		if use x86; then
+			rpm5_unpack $(find ./../ -name "zarafa-licensed*")
+#			rpm5_unpack $(find ./../ -name "zarafa-webaccess-muc*")
 		fi
+		if use amd64; then
+			rpm5_unpack $(find ./../ -name "zarafa-licensed*")
+#			rpm5_unpack $(find ./../ -name "zarafa-webaccess-muc*")
+		fi
+		cd "${S}"
 	fi
 }
 
@@ -176,23 +174,21 @@ src_install() {
 	dodir /var/log/zarafa
 	keepdir /var/log/zarafa
 
-	if ! use arm; 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
+	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
 
 	newinitd "${FILESDIR}"/zarafa-gateway.rc6 zarafa-gateway || die "Failed to install init.d files"