diff --git a/xmonad-start b/xmonad-start
index 737f5f6..afd2d4a 100644
--- a/xmonad-start
+++ b/xmonad-start
@@ -35,6 +35,12 @@ if [ -r $XMONAD_DIR/session ]; then
     sh $XMONAD_DIR/session
 fi
 
+if [ -x /usr/bin/gnome-keyring-daemon ]; then
+    eval $(gnome-keyring-daemon --start)
+    export GNOME_KEYRING_SOCKET
+    export GNOME_KEYRING_PID
+fi
+
 if [ -n "$*" ]; then
     if [ -d $XMONAD_DIR -a "$(ls -t $XMONAD_DIR | head -1)" = "xmonad.hs" ]; then
 	xmonad --recompile
diff --git a/xmonad.spec b/xmonad.spec
index 859d187..c2b4acd 100644
--- a/xmonad.spec
+++ b/xmonad.spec
@@ -7,7 +7,7 @@
 
 Name:           %{pkg_name}
 Version:        0.12
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A tiling window manager
 
 License:        BSD
@@ -219,6 +219,9 @@ rm %{buildroot}%{_datadir}/%{name}-%{version}/man/xmonad.{hs,1,1.html}
 
 
 %changelog
+* Tue Jan 17 2017 Jens Petersen <petersen@redhat.com> - 0.12-3
+- xmonad-start now starts gnome-keyring if installed (Simon Guest, #1413338)
+
 * Thu Jun 30 2016 Jens Petersen <petersen@redhat.com> - 0.12-2
 - rebuild