diff --git a/.abf.yml b/.abf.yml
index b5b50c9..c2f6f7e 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,2 +1,4 @@
-sources:
+removed_sources:
   claws-mail-3.10.1.tar.bz2: 1fb18ce612f0880143f85b418cb4d042d407a068
+sources:
+  claws-mail-3.11.0.tar.xz: 1fc919e7d4357408a04131c4195878ea920de4f0
diff --git a/claws-mail.spec b/claws-mail.spec
index 4287d15..e18a5d0 100644
--- a/claws-mail.spec
+++ b/claws-mail.spec
@@ -6,13 +6,13 @@
 
 Summary:	The user-friendly, lightweight and fast GTK2 based email client
 Name:		claws-mail
-Version:	3.10.1
+Version:	3.11.0
 Release:	1
 Epoch:		1
 License:	GPLv3+
 Group:		Networking/Mail
 Url:		http://www.claws-mail.org
-Source0:	http://downloads.sourceforge.net/sylpheed-claws/%{name}-%{version}.tar.bz2
+Source0:	http://downloads.sourceforge.net/sylpheed-claws/%{name}-%{version}.tar.xz
 # from Debian
 Patch0:		claws-mail-3.7.6-trashed-read.patch
 BuildRequires:	bison
@@ -50,6 +50,8 @@ BuildRequires:	libetpan-devel >= 0.42
 BuildRequires:	libxml2-devel
 BuildRequires:	openldap-devel
 BuildRequires:	perl-devel
+BuildRequires:	pkgconfig(expat)
+BuildRequires:	pkgconfig(libarchive)
 Requires:	compface
 Requires:	rootcerts
 Requires:	common-licenses
@@ -102,7 +104,7 @@ For a complete listing of Features: http://www.claws-mail.org/features.php
 %files -f %{name}.lang
 %{_bindir}/%{name}
 %{_bindir}/sylpheed-claws
-%{_datadir}/appdata/claws-mail.appdata.xml
+#{_datadir}/appdata/claws-mail.appdata.xml
 %{_datadir}/applications/claws-mail.desktop
 %dir %{_libdir}/%{name}
 %dir %{_libdir}/%{name}/plugins
@@ -496,6 +498,20 @@ or received.
 %files vcalendar-plugin
 %{_libdir}/%{name}/plugins/vcalendar.so
 
+%package archive-plugin
+Summary:	Mail Archiver
+Group:		Networking/Mail
+Requires:	%{name} = %{EVRD}
+
+%description archive-plugin
+This plugin adds archiving features to Claws Mail
+
+
+%files archive-plugin
+%{_libdir}/%{name}/plugins/archive.so
+
+
+
 #----------------------------------------------------------------------------
 
 %prep
@@ -509,7 +525,7 @@ or received.
 	--enable-ldap \
 	--enable-crash-dialog \
 	--enable-spamassassin-plugin \
-	--disable-archive-plugin \
+	--enable-archive-plugin \
 	--enable-ipv6 \
 	--enable-compface \
 	--enable-gnutls \