diff --git a/.abf.yml b/.abf.yml
index a55fac5..936ff17 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,2 +1,2 @@
 sources:
-  claws-mail-3.17.8.tar.xz: 6e14cca60a1a0e47ccc071f0cababb2dd1a6ab22
+  claws-mail-4.1.0.tar.xz: 6adfe0953b749734e37a86f2b04a5d52b8b5082f
diff --git a/claws-mail.rpmlintrc b/claws-mail.rpmlintrc
index 00af8ea..2e800ab 100644
--- a/claws-mail.rpmlintrc
+++ b/claws-mail.rpmlintrc
@@ -1 +1,2 @@
 addFilter("W: no-documentation")
+addFilter("E: non-standard-executable-perm")
diff --git a/claws-mail.spec b/claws-mail.spec
index cf0fe35..2611777 100644
--- a/claws-mail.spec
+++ b/claws-mail.spec
@@ -1,6 +1,8 @@
 %define debug_package %{nil}
 %define disable_ld_no_undefined 1
 %define flag_gtk3 1
+%define webkit1 1
+%define litehtml 1
 
 # There are perl scripts in docs/tools and we don't want to install perl
 # modules required by these scripts
@@ -16,13 +18,13 @@
 
 Summary:	The user-friendly, lightweight and fast GTK2 based email client
 Name:		claws-mail
-Version:	3.17.8
-Release:	2
+Version:	4.1.0
+Release:	1
 Epoch:		1
 License:	GPLv3+
 Group:		Networking/Mail
-Url:		http://www.claws-mail.org
-Source0:	http://www.claws-mail.org/releases/%{name}-%{version}.tar.xz
+URL:		https://www.claws-mail.org
+Source0:	%{url}/releases/%{name}-%{version}.tar.xz
 Source1:	claws-mail.rpmlintrc
 # from Debian
 Patch0:		claws-mail-3.13.2-trashed-read.patch
@@ -53,6 +55,7 @@ BuildRequires:	pkgconfig(gnutls) >= 2.2
 BuildRequires:	pkgconfig(gobject-2.0) >= 2.6
 BuildRequires:	pkgconfig(gthread-2.0) >= 2.6
 BuildRequires:	pkgconfig(gtk+-2.0) >= 2.16
+BuildRequires:  pkgconfig(gtk+-3.0)
 BuildRequires:	pkgconfig(indicate-0.6)
 BuildRequires:	pkgconfig(libarchive)
 BuildRequires:	pkgconfig(libcanberra)
@@ -69,12 +72,14 @@ BuildRequires:	pkgconfig(libnotify)
 BuildRequires:	pkgconfig(librsvg-2.0)
 BuildRequires:	pkgconfig(libstartup-notification-1.0) >= 0.5
 BuildRequires:	pkgconfig(libxml-2.0)
-BuildRequires:	pkgconfig(NetworkManager) >= 0.6.2
+#BuildRequires:	pkgconfig(NetworkManager) >= 0.6.2
 BuildRequires:	pkgconfig(poppler)
 BuildRequires:	pkgconfig(poppler-glib)
 BuildRequires:	pkgconfig(pygtk-2.0)
 BuildRequires:	pkgconfig(sm)
 BuildRequires:	pkgconfig(valgrind)
+BuildRequires:  pkgconfig(gumbo)
+BuildRequires:  pkgconfig(pygobject-3.0)
 # libressl
 BuildRequires:  pkgconfig(libressl)
 # for plugin-fancy
@@ -609,6 +614,21 @@ have sent or received.
 
 #-----------------------------------------------------------------------------
 
+%package keyword_warner-plugin
+Summary:	This plugin for %{name} enables shows a worning keywords is found
+Group:		Networking/Mail
+Requires:	%{name} >= %{EVRD}
+
+%description keyword_warner-plugin
+Shows a warning when sending or queueing a message and a
+reference to one or more keywords is found in the message
+text
+
+%files keyword_warner-plugin
+%{_libdir}/%{name}/plugins/keyword_warner.so
+
+#-----------------------------------------------------------------------------
+
 %package tools
 Summary:	This Claws Mail tools
 Group:		Networking/Mail
@@ -635,6 +655,9 @@ This Claws Mail tools.
 	--enable-appdata \
 	--enable-crash-dialog \
 	--enable-gdata-plugin \
+	--disable-networkmanager \
+	--disable-litehtml_viewer-plugin \
+	--enable-ipv6 \
 	--disable-static \
 	--disable-rpath \
 	--disable-manual \