diff --git a/gnome-keyring.spec b/gnome-keyring.spec
index e40d502..015e1a1 100644
--- a/gnome-keyring.spec
+++ b/gnome-keyring.spec
@@ -8,7 +8,7 @@
 Summary: Framework for managing passwords and other secrets
 Name: gnome-keyring
 Version: 2.25.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gnome-keyring/2.24/gnome-keyring-%{version}.tar.bz2
@@ -30,6 +30,9 @@ Requires(pre): GConf2
 Requires(preun): GConf2
 Requires(post): GConf2
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=476300
+Patch0: init-dbus-later.patch
+
 %description
 The gnome-keyring session daemon manages passwords and other types of 
 secrets for the user, storing them encrypted with a main password. 
@@ -64,6 +67,7 @@ automatically unlock the "login" keyring when the user logs in.
 
 %prep
 %setup -q -n gnome-keyring-%{version}
+%patch0 -p1 -b .init-dbus-later
 
 %build
 %configure --disable-gtk-doc --with-pam-dir=/%{_lib}/security --disable-acl-prompts
@@ -131,6 +135,10 @@ fi
 
 
 %changelog
+* Sat Dec 20 2008 Ray Strode <rstrode@redhat.com> - 2.25.2-3
+- Init dbus later (fixes ssh-agent,
+  patch from Yanko Kaneti, bug 476300)
+
 * Fri Dec 12 2008 Matthias Clasen <mclasen@redhat.com> - 2.25.2-2
 - Update to 2.25.2
 
diff --git a/init-dbus-later.patch b/init-dbus-later.patch
new file mode 100644
index 0000000..b355563
--- /dev/null
+++ b/init-dbus-later.patch
@@ -0,0 +1,28 @@
+Author: Yanko Kanetii <yaneti@declera.com>
+Date:   Tue Dec 16 02:31:16 2008 +0200
+
+    On daemon initialisation move the dbus setup after the plugins setup
+    so that all supported environment variables are exported to the session.
+
+diff --git a/daemon/gkr-daemon.c b/daemon/gkr-daemon.c
+index c1966a4..9e26511 100644
+--- a/daemon/gkr-daemon.c
++++ b/daemon/gkr-daemon.c
+@@ -634,8 +634,6 @@ gkr_daemon_complete_initialization(void)
+ 		return TRUE;
+ 	}
+ 	
+-	gkr_daemon_dbus_setup ();
+-	
+ 	/* Initialize object storage */
+ 	if (!gkr_pk_object_storage_initialize ())
+ 		return FALSE;
+@@ -660,6 +658,8 @@ gkr_daemon_complete_initialization(void)
+ 			return FALSE;
+ 	}
+ 	
++	gkr_daemon_dbus_setup ();
++	
+ 	initialization_completed = TRUE;
+ 	return TRUE;
+ }