diff --git a/mate-session-manager.spec b/mate-session-manager.spec
index 51d203b..cc7c676 100644
--- a/mate-session-manager.spec
+++ b/mate-session-manager.spec
@@ -1,13 +1,24 @@
 Name:           mate-session-manager
 Version:        1.6.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        MATE Desktop session manager
 License:        GPLv2+
 URL:            http://mate-desktop.org
 Source0:        http://pub.mate-desktop.org/releases/1.6/%{name}-%{version}.tar.xz
 
 # add systemd-login1 suspend/hibernate love (upstreamable)
-Patch1: mate-session-manager-1.6.1-login1.patch
+# http://git.mate-desktop.org/mate-session-manager/commit/?id=f0b5b1a
+%if 0%{?fedora} > 18
+Patch0:         mate-session-manager-1.6.1-login1.patch
+%endif
+# switch to gnome-keyring > f19
+# 
+%if 0%{?fedora} > 19
+Patch1:         mate-session-manager_switch-to-gnome-keyring.patch
+%endif
+Patch2:         mate-session-manager_autotools.patch
+# http://git.mate-desktop.org/mate-session-manager/commit/?id=2725ff7
+Patch3:         mate-session-manager_systemd-session_id.patch
 
 BuildRequires:  dbus-glib-devel
 BuildRequires:  desktop-file-utils
@@ -39,7 +50,16 @@ full-featured user session.
 %prep
 %setup -q
 
-%patch1 -p1 -b .login1
+%if 0%{?fedora} > 18
+%patch0 -p1 -b .login1
+%endif
+%if 0%{?fedora} > 19
+%patch1 -p1 -b .gnome-keyring
+%endif
+%patch2 -p1 -b .autotools
+%patch3 -p1 -b .systemd-session_id
+
+autoreconf -fi
  
 %build
 %configure --disable-static \
@@ -100,6 +120,10 @@ fi
 
 
 %changelog
+* Wed Oct 16 2013 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.6.1-4
+- switch to gnome-keyring for > f19
+- add mate-session-manager_systemd-session_id.patch
+
 * Tue Sep 10 2013 Rex Dieter <rdieter@fedoraproject.org> 1.6.1-3
 - initial attempt at systemd-login1 suspend/hibernate support