diff --git a/mail-client/claws-mail/Manifest b/mail-client/claws-mail/Manifest
new file mode 100644
index 000000000..1f44ab175
--- /dev/null
+++ b/mail-client/claws-mail/Manifest
@@ -0,0 +1,2 @@
+DIST claws-mail-3.10.1.tar.xz 6669376 SHA256 4cb7c42995b1a5d7567a0909ce2080c05eec74a4d966da7a7a872f5eba018459 SHA512 b001683522a9a2bb9b1680f8ff608172a3fe9c4f556c8aa818b4259801bc92f722093850218377aba3a5fe549f0f09164c2e7623042bca0dbf3fd1071436dc80 WHIRLPOOL 0bcf92138081cd6fe0bef18a85acc9939fe61ab87faafc27a0ded24e321b4a35c0a1f6736aee6b0eef7d2d451c037cddcb280fece1a1c38c2e8f20c45ef685f7
+EBUILD claws-mail-3.10.1.ebuild 6415 SHA256 545ceca1d0261a77f7c3a75427f25aef8f840bc0700e9dd573dae5746f76a5eb SHA512 27f8e271a64b2ff01439c0442f3165343ce50218c61ed098f388d6f98c7f123f1d87e8a8392edf11e7acba15eadfd4ea849792d294af0acc3f9343d0f40848f1 WHIRLPOOL 2b2b1f285baa8fa390571a81873c9e11febdc038164fc71b25473e990a7742aff768dd9f074f032b45312397e6b1bd71bc1b637824d7166057362b8218893f74
diff --git a/mail-client/claws-mail/claws-mail-3.10.1.ebuild b/mail-client/claws-mail/claws-mail-3.10.1.ebuild
new file mode 100644
index 000000000..9cd277831
--- /dev/null
+++ b/mail-client/claws-mail/claws-mail-3.10.1.ebuild
@@ -0,0 +1,205 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail/claws-mail-3.10.1.ebuild,v 1.3 2014/08/20 11:29:04 armin76 Exp $
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_{6,7} )
+AUTOTOOLS_AUTORECONF=yes
+
+inherit autotools-utils multilib gnome2-utils eutils python-single-r1
+
+DESCRIPTION="An email client (and news reader) based on GTK+"
+HOMEPAGE="http://www.claws-mail.org/"
+
+SRC_URI="mirror://sourceforge/${PN}/Claws%20Mail/${PV}/${P}.tar.xz"
+
+SLOT="0"
+LICENSE="GPL-3"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+IUSE="archive bogofilter calendar clamav dbus debug doc gdata gtk3 +imap ipv6 ldap +libcanberra +libindicate +libnotify networkmanager nntp +notification pda pdf perl +pgp python rss session smime spamassassin spam-report spell +gnutls startup-notification valgrind webkit xface"
+REQUIRED_USE="networkmanager? ( dbus )
+	smime? ( pgp )
+	libcanberra? ( notification )
+	libindicate? ( notification )
+	libnotify? ( notification )"
+
+# Plugins are all integrated or dropped since 3.9.1
+PLUGINBLOCK="!mail-client/claws-mail-acpi-notifier
+	!mail-client/claws-mail-archive
+	!mail-client/claws-mail-att-remover
+	!mail-client/claws-mail-attachwarner
+	!mail-client/claws-mail-clamd
+	!mail-client/claws-mail-fancy
+	!mail-client/claws-mail-fetchinfo
+	!mail-client/claws-mail-gdata
+	!mail-client/claws-mail-geolocation
+	!mail-client/claws-mail-gtkhtml
+	!mail-client/claws-mail-mailmbox
+	!mail-client/claws-mail-newmail
+	!mail-client/claws-mail-notification
+	!mail-client/claws-mail-perl
+	!mail-client/claws-mail-python
+	!mail-client/claws-mail-rssyl
+	!mail-client/claws-mail-spam-report
+	!mail-client/claws-mail-tnef-parse
+	!mail-client/claws-mail-vcalendar
+	!mail-client/claws-mail-address_keeper
+	!mail-client/claws-mail-pdf-viewer"
+
+COMMONDEPEND=">=sys-devel/gettext-0.12.1
+	gdata? ( >=dev-libs/libgdata-0.6.4 )
+	gtk3? ( x11-libs/gtk+:3 )
+	!gtk3? ( >=x11-libs/gtk+-2.20:2 )
+	pda? ( >=app-pda/jpilot-0.99 )
+	gnutls? ( >=net-libs/gnutls-2.2.0 )
+	ldap? ( >=net-nds/openldap-2.0.7 )
+	pgp? ( >=app-crypt/gpgme-0.4.5 )
+	valgrind? ( dev-util/valgrind )
+	dbus? ( >=dev-libs/dbus-glib-0.60 )
+	spell? ( >=app-text/enchant-1.0.0 )
+	imap? ( >=net-libs/libetpan-0.57 )
+	nntp? ( >=net-libs/libetpan-0.57 )
+	startup-notification? ( x11-libs/startup-notification )
+	session? ( x11-libs/libSM
+			x11-libs/libICE )
+	archive? ( app-arch/libarchive
+		>=net-misc/curl-7.9.7 )
+	bogofilter? ( mail-filter/bogofilter )
+	notification? (
+		libnotify? ( x11-libs/libnotify )
+		libcanberra? (  media-libs/libcanberra[gtk] )
+		libindicate? ( dev-libs/libindicate:3[gtk] )
+		dev-libs/glib
+	)
+	smime? ( >=app-crypt/gpgme-0.4.5 )
+	calendar? ( >=net-misc/curl-7.9.7 )
+	pdf? ( app-text/poppler:=[cairo] )
+	spam-report? ( >=net-misc/curl-7.9.7 )
+	webkit? ( >=net-libs/webkit-gtk-1.0:2
+		>=net-libs/libsoup-gnome-2.26:2.4 )
+"
+
+DEPEND="${PLUGINBLOCK}
+	${COMMONDEPEND}
+	app-arch/xz-utils
+	xface? ( >=media-libs/compface-1.4 )
+	virtual/pkgconfig"
+
+RDEPEND="${COMMONDEPEND}
+	pdf? ( app-text/ghostscript-gpl )
+	clamav? ( app-antivirus/clamav )
+	networkmanager? ( net-misc/networkmanager )
+	perl? ( dev-lang/perl )
+	python? ( ${PYTHON_DEPS}
+		>=dev-python/pygtk-2.10.3 )
+	rss? ( net-misc/curl
+		dev-libs/libxml2 )
+	app-misc/mime-types
+	x11-misc/shared-mime-info"
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable debug crash-dialog)
+		$(use_enable valgrind valgrind)
+		$(use_enable doc manual)
+		$(use_enable gtk3)
+		$(use_enable ipv6)
+		$(use_enable ldap)
+		$(use_enable dbus dbus)
+		$(use_enable networkmanager)
+		$(use_enable pda jpilot)
+		$(use_enable session libsm)
+		$(use_enable spell enchant)
+		$(use_enable gnutls)
+		$(use_enable startup-notification)
+		$(use_enable xface compface)
+		$(use_enable archive archive-plugin)
+		$(use_enable bogofilter bogofilter-plugin)
+		$(use_enable calendar vcalendar-plugin)
+		$(use_enable clamav clamd-plugin)
+		$(use_enable gdata gdata-plugin)
+		$(use_enable notification notification-plugin)
+		$(use_enable pdf pdf_viewer-plugin)
+		$(use_enable perl perl-plugin)
+		$(use_enable pgp pgpmime-plugin)
+		$(use_enable pgp pgpinline-plugin)
+		$(use_enable pgp pgpcore-plugin)
+		$(use_enable python python-plugin)
+		$(use_enable rss rssyl-plugin)
+		$(use_enable spamassassin spamassassin-plugin)
+		$(use_enable smime smime-plugin)
+		$(use_enable spam-report spam_report-plugin)
+		$(use_enable webkit fancy-plugin)
+		--enable-new-addrbook
+		--enable-nls
+		--enable-acpi_notifier-plugin
+		--enable-address_keeper-plugin
+		--enable-att_remover-plugin
+		--enable-attachwarner-plugin
+		--enable-fetchinfo-plugin
+		--enable-mailmbox-plugin
+		--enable-newmail-plugin
+		--enable-tnef_parse-plugin
+		--disable-generic-umpc
+		--disable-bsfilter-plugin
+		--disable-geolocation-plugin
+	)
+
+	# libetpan is needed if user wants nntp or imap functionality
+	if use imap || use nntp; then
+		myeconfargs+=( --enable-libetpan )
+	else
+		myeconfargs+=( --disable-libetpan )
+	fi
+
+	autotools-utils_src_configure
+}
+
+src_install() {
+	local DOCS=( AUTHORS ChangeLog* INSTALL* NEWS README* TODO* )
+	autotools-utils_src_install
+
+	# Makefile install claws-mail.png in /usr/share/icons/hicolor/48x48/apps
+	# => also install it in /usr/share/pixmaps for other desktop envs
+	# => also install higher resolution icons in /usr/share/icons/hicolor/...
+	insinto /usr/share/pixmaps
+	doins ${PN}.png || die
+	local res resdir
+	for res in 64x64 128x128 ; do
+		resdir="/usr/share/icons/hicolor/${res}/apps"
+		insinto ${resdir}
+		newins ${PN}-${res}.png ${PN}.png || die
+	done
+
+	docinto tools
+	dodoc tools/README*
+
+	domenu ${PN}.desktop
+
+	einfo "Installing extra tools"
+	cd "${S}"/tools
+	exeinto /usr/$(get_libdir)/${PN}/tools
+	doexe *.pl *.py *.conf *.sh || die
+	doexe tb2claws-mail update-po uudec uuooffice || die
+
+	# kill useless files
+	rm -f "${D}"/usr/lib*/claws-mail/plugins/*.{a,la}
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	ewarn "When upgrading from version 3.9.0 or below some changes have happened:"
+	ewarn "- There are no individual plugins in mail-client/claws-mail-* anymore, but they are integrated mostly controlled through USE flags"
+	ewarn "- Plugins with no special dependencies are just built and can be loaded through the interface"
+	ewarn "- The gtkhtml2, dillo and trayicon plugins have been dropped entirely"
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/profiles/templates/3.2/6_ac_update_sync/revision/06 b/profiles/templates/3.2/6_ac_update_sync/revision/06
new file mode 100644
index 000000000..922378d76
--- /dev/null
+++ b/profiles/templates/3.2/6_ac_update_sync/revision/06
@@ -0,0 +1,14 @@
+# Calculate ini(update.revision)<6 exec=/bin/bash
+
+#-ini(update.rev,6)-#
+
+#?pkg(mail-client/claws-mail-address_keeper)!=#
+test -f /var/db/pkg/mail-client/claws-mail-address_keeper-*/CONTENTS &&
+   sed -i '/claws-mail\/plugins\/address_keeper.so/d' /var/db/pkg/mail-client/claws-mail-address_keeper-*/CONTENTS
+#pkg#
+#?pkg(mail-client/claws-mail-fancy)!=#
+test -f /var/db/pkg/mail-client/claws-mail-fancy-*/CONTENTS &&
+   sed -i '/claws-mail\/plugins\/fancy.so/d' /var/db/pkg/mail-client/claws-mail-fancy-*/CONTENTS
+#pkg#
+
+exit 0