diff --git a/.gitignore b/.gitignore
index e931757..41f9830 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,19 @@
+<<<<<<< HEAD
 /*.tar.bz2
+=======
+/vdr-plugin-epg2vdr-324f3928b068255f0c4bf6ed0a575485f5ead1c4.tar.bz2
+/vdr-plugin-epg2vdr-866f08dcd537979641ae2da13d976dd05cc7994d.tar.bz2
+/vdr-plugin-epg2vdr-d8382ba4132fc27deec0997a407da4dbd28dd2aa.tar.bz2
+/vdr-plugin-epg2vdr-94798312563927194f2bb3e7c2ab102a3689bd7a.tar.bz2
+/vdr-plugin-epg2vdr-caeef7901c970bc7bcc2e073f7ff740c208a83bc.tar.bz2
+/vdr-plugin-epg2vdr-a569a6e922da3463d8792af43e92d4b9cc05f8bf.tar.bz2
+/vdr-plugin-epg2vdr-d264ad83ac3b2eb7d0230f9ecf4230cdee1d4f74.tar.bz2
+/vdr-plugin-epg2vdr-9b92181f9aed7ca6f1b1779cd15f5cb4d39cd3ed.tar.bz2
+/vdr-plugin-epg2vdr-45ae8b4e4dea082d1e6d9bfb9d8a02d673ffb050.tar.bz2
+/vdr-plugin-epg2vdr-57766287256873ab843f1366258e139b5ccf9dbb.tar.bz2
+/vdr-plugin-epg2vdr-9add62903ad50bd7be7cc2853c1abd3027d819d8.tar.bz2
+/vdr-plugin-epg2vdr-4906742038cb851133ce4fadc359240f63b272a3.tar.bz2
+/vdr-plugin-epg2vdr-0500f7505c490e57585de8faeda29cedf3b7a92f.tar.bz2
+/vdr-plugin-epg2vdr-87802bc33f366fc852121d48a0f8be609cbe65f4.tar.bz2
+/vdr-plugin-epg2vdr-ec38f0c4337706291ac6dd7fdd711dfce9ece60f.tar.bz2
+>>>>>>> master
diff --git a/sources b/sources
index 90e83d1..a73a1f5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0c9fabe3b8f28c5e22fcff51d61625d4  vdr-plugin-epg2vdr-87802bc33f366fc852121d48a0f8be609cbe65f4.tar.bz2
+147a3e09818776d5657e748c9b9161bb  vdr-plugin-epg2vdr-ec38f0c4337706291ac6dd7fdd711dfce9ece60f.tar.bz2
diff --git a/vdr-epg2vdr.spec b/vdr-epg2vdr.spec
index 2642d1a..8b7a0e3 100644
--- a/vdr-epg2vdr.spec
+++ b/vdr-epg2vdr.spec
@@ -1,10 +1,10 @@
-%global commit  87802bc33f366fc852121d48a0f8be609cbe65f4
+%global commit  ec38f0c4337706291ac6dd7fdd711dfce9ece60f
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global gitdate 20151020
+%global gitdate 20151021
 
 Name:           vdr-epg2vdr
 Version:        0.1.13
-Release:        4.%{gitdate}git%{shortcommit}%{?dist}
+Release:        5.%{gitdate}git%{shortcommit}%{?dist}
 Summary:        A plugin to retrieve EPG data from a mysql database into VDR
 
 Group:          Applications/Multimedia
@@ -54,6 +54,9 @@ chmod 0755 %{buildroot}/%{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion}
 %{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion}
 
 %changelog
+* Wed Oct 21 2015 Martin Gansser <martinkg@fedoraproject.org> - 0.1.13-5.20151021gitec38f0c
+- rebuild for new git release
+
 * Tue Oct 20 2015 Martin Gansser <martinkg@fedoraproject.org> - 0.1.13-4.20151020git87802bc
 - rebuild for new git release