diff --git a/.gitignore b/.gitignore
index 17d6b36..1a2d5cf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /*.tgz
+/vdr-plugin-epgsearch-2.4.0.tar.bz2
diff --git a/sources b/sources
index 49bcc0f..b61497b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6e63cc29df02f48fabf6e12e1e71b2fc  vdr-epgsearch-1.0.1.beta5.tgz
+SHA512 (vdr-plugin-epgsearch-2.4.0.tar.bz2) = f1d7995a567bbbd112292a2ff753649f695b7801ffbefd885445b6aac2381f151a69de208405b3868c2609c775bc6367528ee5acca060e0e45b8568862cb9387
diff --git a/vdr-epgsearch-2.4.0-fedora.patch b/vdr-epgsearch-2.4.0-fedora.patch
new file mode 100644
index 0000000..2c77553
--- /dev/null
+++ b/vdr-epgsearch-2.4.0-fedora.patch
@@ -0,0 +1,40 @@
+--- vdr-plugin-epgsearch-2.4.0/epgsearch.c.orig	2018-04-18 09:52:20.771857071 +0200
++++ vdr-plugin-epgsearch-2.4.0/epgsearch.c	2018-04-18 09:54:13.613374320 +0200
+@@ -455,16 +455,16 @@
+     LoadConfD();
+     LoadUserVars();
+ 
+-    ChannelGroups.Load(AddDirectory(CONFIGDIR, "epgsearchchangrps.conf"), true);
+-    Blacklists.Load(AddDirectory(CONFIGDIR, "epgsearchblacklists.conf"));
+-    SearchExts.Load(AddDirectory(CONFIGDIR, "epgsearch.conf"));
+-    SearchTemplates.Load(AddDirectory(CONFIGDIR, "epgsearchtemplates.conf"));
+-    RecsDone.Load(AddDirectory(CONFIGDIR, "epgsearchdone.data"));
+-    SwitchTimers.Load(AddDirectory(CONFIGDIR, "epgsearchswitchtimers.conf"));
+-    NoAnnounces.Load(AddDirectory(CONFIGDIR, "noannounce.conf"));
+-    DefTimerCheckModes.Load(AddDirectory(CONFIGDIR, "deftimerchkmodes.conf"));
+-    TimersDone.Load(AddDirectory(CONFIGDIR, "timersdone.conf"));
+-    PendingNotifications.Load(AddDirectory(CONFIGDIR, "pendingnotifications.conf"));
++   ChannelGroups.Load("__VARDIR__/epgsearch/epgsearchchangrps.conf", true);
++   Blacklists.Load("__VARDIR__/epgsearch/epgsearchblacklists.conf");
++   SearchExts.Load("__VARDIR__/epgsearch/epgsearch.conf");
++   SearchTemplates.Load("__VARDIR__/epgsearch/epgsearchtemplates.conf");
++   RecsDone.Load("__VARDIR__/epgsearch/epgsearchdone.data");
++   SwitchTimers.Load("__VARDIR__/epgsearch/epgsearchswitchtimers.conf");
++   NoAnnounces.Load("__VARDIR__/epgsearch/noannounce.conf");
++   DefTimerCheckModes.Load("__VARDIR__/epgsearch/deftimerchkmodes.conf");
++   TimersDone.Load("__VARDIR__/epgsearch/timersdone.conf");
++   PendingNotifications.Load("__VARDIR__/epgsearch/pendingnotifications.conf");
+ 
+     cSearchTimerThread::Init(this);
+     cSwitchTimerThread::Init();
+--- vdr-plugin-epgsearch-2.4.0/epgsearchcfg.c.orig	2018-04-18 09:50:49.099003046 +0200
++++ vdr-plugin-epgsearch-2.4.0/epgsearchcfg.c	2018-04-18 09:56:39.880934757 +0200
+@@ -76,7 +76,7 @@
+     strcpy(MailAuthUser, "");
+     strcpy(MailAuthPass, "");
+     strcpy(LastMailConflicts, "");
+-    mailViaScript = 1;
++    mailViaScript = 0;
+     manualTimerCheckDefault = 0;
+     noAnnounceWhileReplay = 0;
+     TimerProgRepeat = 0;
diff --git a/vdr-epgsearch.spec b/vdr-epgsearch.spec
index d379f09..00d1a92 100644
--- a/vdr-epgsearch.spec
+++ b/vdr-epgsearch.spec
@@ -1,30 +1,21 @@
 %global pname   epgsearch
-%global beta    .beta5
 %global __provides_exclude_from ^%{vdr_plugindir}/.*\\.so.*$
 
 Name:           vdr-%{pname}
-Version:        1.0.1
-Release:        %{?beta:0.}14%{?beta}%{?dist}.4
+Version:        2.4.0
+Release:        1%{?dist}
 Summary:        Powerful schedules menu replacement plugin for VDR
 
 License:        GPLv2+
 URL:            http://winni.vdr-developer.org/epgsearch/index_eng.html
-Source0:        http://winni.vdr-developer.org/epgsearch/downloads/%{?beta:beta/}%{name}-%{version}%{?beta}.tgz
+Source0:        https://projects.vdr-developer.org/git/vdr-plugin-epgsearch.git/snapshot/vdr-plugin-epgsearch-2.4.0.tar.bz2
 Source1:        %{name}.conf
 Source2:        %{name}-epgsearchonly.conf
 Source3:        %{name}-conflictcheckonly.conf
 Source4:        %{name}-quickepgsearch.conf
 Source5:        %{name}-epgsearchmenu.conf
 # Fedora specific, no need to send upstream
-Patch0:         %{name}-1.0.1.beta2-fedora.patch
-# http://projects.vdr-developer.org/git/vdr-plugin-epgsearch.git/commit/?id=f4231d4b56f0f899d39a011992da348a30e30429
-Patch1:         0001-api-change-in-VideoDirectory.patch
-# http://projects.vdr-developer.org/git/vdr-plugin-epgsearch.git/commit/?id=6937a8d166cf0803e20993dbc2bc19e2dbaf98ee
-Patch2:         0001-enable-usage-of-PLGCFG-1762.patch
-# https://projects.vdr-developer.org/git/vdr-plugin-epgsearch.git/patch/?id=58519c44d5a4c395b0fddf092a822e812e33b3b8
-Patch3:         0001-fix-for-bug-2214.patch
-# https://projects.vdr-developer.org/git/vdr-plugin-epgsearch.git/commit/?id=e5b50757feff685cc7e2fe280ee940c1160b3aad
-Patch4:         0001-fix-summary-comparison-when-checking-for-repeats-was.patch
+Patch0:         %{name}-2.4.0-fedora.patch
 
 BuildRequires:  vdr-devel >= 1.7.36
 Requires:       vdr(abi)%{?_isa} = %{vdr_apiversion}
@@ -37,12 +28,8 @@ reusable queries which can be used as dynamic "search timers" etc.
 
 
 %prep
-%setup -q -n %{pname}-%{version}%{?beta}
+%setup -q -n vdr-plugin-%{pname}-%{version} vdr-plugin-epgsearch-2.4.0
 sed -e 's|__VARDIR__|%{vdr_vardir}|g' %{PATCH0} | %{__patch} -p1 --fuzz=0
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
 
 for f in scripts/epgsearchcmds-french.conf conf/epgsearchcats.conf-tvm2vdr* ; do
     iconv -f iso-8859-1 -t utf-8 -o $f.utf8 $f ; mv $f.utf8 $f
@@ -92,6 +79,11 @@ install -dm 755 $RPM_BUILD_ROOT%{vdr_vardir}/epgsearch
 
 
 %changelog
+* Wed Apr 18 2018 Martin Gansser <martinkg@fedoraproject.org> - 1.0.1-0.14.beta5.5
+- Update to vdr-2.4.0
+- Adjust %%{name}-2.4.0-fedora.patch
+- Remove unneeded patches
+
 * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-0.14.beta5.4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild