diff --git a/.abf.yml b/.abf.yml
index 1c1ad6e..177e8cc 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,2 +1,2 @@
 sources:
-  claws-mail-3.16.0.tar.xz: 74bf5c3c8e125864a4e8429d681a9178e8d44c38
+  claws-mail-3.17.1.tar.xz: 7c6f34259e5f5e9b577feab1fa563b665d551399
diff --git a/claws-mail.spec b/claws-mail.spec
index 518ea73..228b6c6 100644
--- a/claws-mail.spec
+++ b/claws-mail.spec
@@ -1,7 +1,6 @@
 %define debug_package %{nil}
 %define disable_ld_no_undefined 1
 %define flag_gtk3 0
-%define flag_demo 1
 
 # There are perl scripts in docs/tools and we don't want to install perl
 # modules required by these scripts
@@ -9,7 +8,7 @@
 
 Summary:	The user-friendly, lightweight and fast GTK2 based email client
 Name:		claws-mail
-Version:	3.16.0
+Version:	3.17.1
 Release:	1
 Epoch:		1
 License:	GPLv3+
@@ -121,14 +120,14 @@ Improved features include:
 For a complete listing of Features: http://www.claws-mail.org/features.php
 
 %files -f %{name}.lang
+%dir %{_libdir}/%{name}
+%dir %{_libdir}/%{name}/plugins
 %{_bindir}/%{name}
 %{_bindir}/sylpheed-claws
 #%{_datadir}/appdata/claws-mail.appdata.xml
 %{_datadir}/applications/claws-mail.desktop
-%dir %{_libdir}/%{name}
-%dir %{_libdir}/%{name}/plugins
-%{_iconsdir}/hicolor/*/apps/*.png
 %{_docdir}/claws-mail
+%{_iconsdir}/hicolor/*/apps/*.png
 
 #----------------------------------------------------------------------------
 
@@ -271,20 +270,16 @@ for spam using Clam AntiVirus.
 
 #----------------------------------------------------------------------------
 
-%if %flag_demo
-
-%package demo
-Summary:	This Claws Mail demo plugin for programming
+%package dillo-plugin
+Summary:	This plugin renders HTML e-mails through dillo
 Group:		Networking/Mail
-Requires:	%{name} = %{EVRD}
+Requires:	dillo
 
-%description demo
-Demo plugin for Claws Mail
+%description dillo-plugin
+Renders HTML e-mail using dillo webbrowser
 
-%files demo
-%{_libdir}/%{name}/plugins/demo.so
-
-%endif
+%files dillo-plugin
+%{_libdir}/%{name}/plugins/dillo.so
 
 #----------------------------------------------------------------------------
 
@@ -591,6 +586,23 @@ This Claws Mail plugin enables parsing MS-TNEF attachments.
 
 #-----------------------------------------------------------------------------
 
+%package vcalendar-plugin
+Summary:	This plugin for %{name} enables vCalendar message handling
+Group:		Networking/Mail
+BuildRequires:	pkgconfig(libical)
+Requires:	%{name} >= %{EVRD}
+
+%description vcalendar-plugin
+This %{name} plugin handles the vCalendar format (or rather, the
+meeting subset of it). It displays such mails in a nice format, lets you
+create and send meetings, and creates a virtual folder with the meetings you
+have sent or received.
+
+%files vcalendar-plugin
+%{_libdir}/%{name}/plugins/vcalendar.so
+
+#-----------------------------------------------------------------------------
+
 %package tools
 Summary:	This Claws Mail tools
 Group:		Networking/Mail
@@ -609,27 +621,14 @@ This Claws Mail tools.
 %patch0 -p1
 
 %build
-export CFLAGS+=" -Wno-error"
 %configure2_5x \
-	--enable-archive-plugin \
-	--enable-compface \
-	--enable-crash-dialog \
-	--enable-enchant \
-%if %flag_gtk3
+%if %{flag_gtk3}
 	--enable-gtk3 \
 %endif
-	--enable-ipv6 \
-	--enable-jpilot \
-	--enable-ldap \
-	--enable-gnutls \
-	--enable-spamassassin-plugin \
-%if %flag_demo
-	--enable-demo-plugin \
-%else
-	--disable-demo-plugin \
-%endif
+	--enable-crash-dialog \
+	--disable-static \
 	--disable-rpath \
-	--disable-static
+	--disable-manual
 
 %make LIBTOOL=%{_bindir}/libtool