diff --git a/vdr-epgfixer.spec b/vdr-epgfixer.spec
index a5488ed..c9c75f3 100644
--- a/vdr-epgfixer.spec
+++ b/vdr-epgfixer.spec
@@ -1,18 +1,14 @@
 %global pname   epgfixer
 %global __provides_exclude_from ^%{vdr_plugindir}/
-%global commit  354f28b0112ba27f08f6509243b410899f74b6ed
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global gitdate 20180416
 
 Name:           vdr-%{pname}
 Version:        0.3.1
-Release:        7.%{gitdate}git%{shortcommit}%{?dist}
+Release:        6%{?dist}
 Summary:        VDR plugin for doing extra fixing of EPG data
 
 License:        GPLv2+
 URL:            https://projects.vdr-developer.org/projects/plg-epgfixer
-Source0:        https://projects.vdr-developer.org/git/vdr-plugin-epgfixer.git/snapshot/vdr-plugin-epgfixer-%{commit}.tar.bz2
-
+Source0:        https://projects.vdr-developer.org/attachments/download/1138/%{name}-%{version}.tgz
 Source1:        %{name}.conf
 # https://projects.vdr-developer.org/git/vdr-plugin-epgfixer.git/commit/?id=2b099cc01701e784fa5b1c53f38fd592b0b3ae42
 Patch0:         0001-Fix-replacing-at-the-end-of-string-when-using-s-.-Fi.patch
@@ -31,23 +27,32 @@ editing all settings through setup menu.
 
 
 %prep
-%setup -q -n vdr-plugin-%{pname}-%{commit}
+%setup -q -n %{pname}-%{version}
+%patch0 -p1
+%patch1 -p1
 
 
 %build
-make CFLAGS="%{optflags} -fPIC" CXXFLAGS="%{optflags} -fPIC" %{?_smp_mflags} \
-     LIBDIR=. LOCALEDIR=./locale VDRDIR=%{_libdir}/vdr
+make %{?_smp_mflags} LIBDIR=. LOCALEDIR=./locale VDRDIR=%{_libdir}/vdr
 
 
 %install
+
+install -dm 755 $RPM_BUILD_ROOT%{vdr_plugindir}
+install -pm 755 libvdr-%{pname}.so.%{vdr_apiversion} \
+    $RPM_BUILD_ROOT%{vdr_plugindir}
 install -dm 755 $RPM_BUILD_ROOT%{vdr_configdir}/plugins/%{pname}
 install -pm 644 epgfixer/{blacklist,charset,epgclone,regexp}.conf \
     $RPM_BUILD_ROOT%{vdr_configdir}/plugins/%{pname}
+
 install -Dpm 644 %{SOURCE1} \
     $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}.conf
-%make_install
+
+install -dm 755 $RPM_BUILD_ROOT%{_datadir}/locale
+cp -pR locale/* $RPM_BUILD_ROOT%{_datadir}/locale
 %find_lang %{name}
 
+
 %files -f %{name}.lang
 %license COPYING
 %doc HISTORY README
@@ -59,10 +64,6 @@ install -Dpm 644 %{SOURCE1} \
 
 
 %changelog
-* Thu Apr 26 2018 Martin Gansser <martinkg@fedoraproject.org> - 0.3.1-7.20180416git354f28b
-- Update to 0.3.1-7.20180416git354f28b
-- Rebuilt for vdr-2.4.0
-
 * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.1-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild