diff --git a/.cvsignore b/.cvsignore
index 714ff93..0296bb8 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-keyring-2.25.2.tar.bz2
+gnome-keyring-2.25.4.tar.bz2
diff --git a/gnome-keyring.spec b/gnome-keyring.spec
index 021aa26..66468cf 100644
--- a/gnome-keyring.spec
+++ b/gnome-keyring.spec
@@ -7,8 +7,8 @@
 
 Summary: Framework for managing passwords and other secrets
 Name: gnome-keyring
-Version: 2.25.2
-Release: 3%{?dist}
+Version: 2.25.4
+Release: 1%{?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,10 +30,6 @@ Requires(pre): GConf2
 Requires(preun): GConf2
 Requires(post): GConf2
 
-# https://bugzilla.redhat.com/show_bug.cgi?id=476300
-# http://mail.gnome.org/archives/gnome-keyring-list/2008-December/msg00004.html
-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. 
@@ -68,7 +64,6 @@ 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
@@ -83,6 +78,7 @@ unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 rm $RPM_BUILD_ROOT/%{_lib}/security/*.la
 rm $RPM_BUILD_ROOT%{_libdir}/*.la
 rm $RPM_BUILD_ROOT%{_libdir}/gnome-keyring/*.la
+rm $RPM_BUILD_ROOT%{_libdir}/gnome-keyring/devel/*.la
 
 %find_lang gnome-keyring
 
@@ -115,6 +111,7 @@ fi
 %{_libdir}/lib*.so.*
 %dir %{_libdir}/gnome-keyring
 %{_libdir}/gnome-keyring/gnome-keyring-pkcs11.so
+%{_libdir}/gnome-keyring/devel/*.so
 # GPL
 %{_bindir}/*
 %{_libexecdir}/*
@@ -136,6 +133,9 @@ fi
 
 
 %changelog
+* Mon Jan  5 2009 Tomas Bzatek <tbzatek@redhat.com> - 2.25.4-1
+- Update to 2.25.4
+
 * 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)
diff --git a/init-dbus-later.patch b/init-dbus-later.patch
deleted file mode 100644
index b355563..0000000
--- a/init-dbus-later.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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;
- }
diff --git a/sources b/sources
index 278fb03..8e3f246 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8e0ec750d5af38d86f12491b48a9c390  gnome-keyring-2.25.2.tar.bz2
+801b581f3ca0a4554ceac774eaa60f1d  gnome-keyring-2.25.4.tar.bz2