diff --git a/.cvsignore b/.cvsignore
index 2556c3e..3c2da6b 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-keyring-2.28.0.tar.bz2
+gnome-keyring-2.28.1.tar.bz2
diff --git a/gnome-keyring-no-logout-delay.patch b/gnome-keyring-no-logout-delay.patch
deleted file mode 100644
index a1c3feb..0000000
--- a/gnome-keyring-no-logout-delay.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff --git a/daemon/gkr-daemon.c b/daemon/gkr-daemon.c
-index c63081e..ea85edf 100644
---- a/daemon/gkr-daemon.c
-+++ b/daemon/gkr-daemon.c
-@@ -43,6 +43,7 @@
- #include <unistd.h>
- #include <fcntl.h>
- #include <errno.h>
-+#include <pthread.h>
- #include <stdlib.h>
- #include <stdio.h>
- #include <string.h>
-@@ -90,6 +91,8 @@ static gboolean run_for_start = FALSE;
- static gchar* run_components = NULL;
- static gchar* login_password = NULL;
- static gboolean initialization_completed = FALSE;
-+static gboolean s_thread_valid = FALSE;
-+static pthread_t s_thread;
- 
- static GOptionEntry option_entries[] = {
- 	{ "foreground", 'f', 0, G_OPTION_ARG_NONE, &run_foreground, 
-@@ -370,7 +373,7 @@ signal_thread (gpointer user_data)
- static void
- setup_signal_handling (GMainLoop *loop)
- {
--	GError *error = NULL;
-+	int res;
- 
- 	/*
- 	 * Block these signals for this thread, and any threads
-@@ -387,11 +390,12 @@ setup_signal_handling (GMainLoop *loop)
- 	sigaddset (&signal_set, SIGTERM);
- 	pthread_sigmask (SIG_BLOCK, &signal_set, NULL);
- 
--	g_thread_create (signal_thread, loop, FALSE, &error);
--	if (error != NULL) {
-+	res = pthread_create (&s_thread, NULL, signal_thread, loop);
-+	if (res == 0) {
-+		s_thread_valid = TRUE;
-+	} else {
- 		g_warning ("couldn't startup thread for signal handling: %s",
--		           error && error->message ? error->message : "");
--		g_clear_error (&error);
-+		           strerror (res));
- 	}
- }
- 
-@@ -404,7 +408,10 @@ gkr_daemon_quit (void)
- 	 * starts the shutdown process.
- 	 */
- 
--	raise (SIGTERM);
-+	if (s_thread_valid)
-+		pthread_kill (s_thread, SIGTERM);
-+	else
-+		raise (SIGTERM);
- }
- 
- static void
diff --git a/gnome-keyring.spec b/gnome-keyring.spec
index 0da76dd..7578928 100644
--- a/gnome-keyring.spec
+++ b/gnome-keyring.spec
@@ -7,18 +7,12 @@
 
 Summary: Framework for managing passwords and other secrets
 Name: gnome-keyring
-Version: 2.28.0
-Release: 4%{?dist}
+Version: 2.28.1
+Release: 1%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gnome-keyring/2.28/gnome-keyring-%{version}.tar.bz2
 
-# https://bugzilla.gnome.org/show_bug.cgi?id=595698
-Patch0: gnome-keyring-no-logout-delay.patch
-
-# fixed upstream: https://bugzilla.gnome.org/show_bug.cgi?id=597813
-Patch1: rsa1-keys.patch
-
 # https://bugzilla.gnome.org/show_bug.cgi?id=598494
 Patch2: gnome-keyring-2.28.0-die-on-session-exit.patch
 
@@ -74,8 +68,6 @@ automatically unlock the "login" keyring when the user logs in.
 
 %prep
 %setup -q -n gnome-keyring-%{version}
-%patch0 -p1 -b .logout-delay
-%patch1 -p1 -b .rsa1-keys
 %patch2 -p1 -b .die-on-session-exit
 
 %build
@@ -154,6 +146,9 @@ fi
 
 
 %changelog
+* Mon Oct 19 2009 Tomas Bzatek <tbzatek@redhat.com> - 2.28.1-1
+- Update to 2.28.1
+
 * Wed Oct 14 2009 Ray Strode <rstrode@redhat.com> - 2.28.0-4
 - Die on ctrl-alt-backspace and other abrupt exits
 
diff --git a/rsa1-keys.patch b/rsa1-keys.patch
deleted file mode 100644
index 5959f7f..0000000
--- a/rsa1-keys.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 63c148b12c08ea0cfe72ac921abdcbebba84acc1 Mon Sep 17 00:00:00 2001
-From: Vincent Untz <vuntz@gnome.org>
-Date: Thu, 8 Oct 2009 16:25:11 +0200
-Subject: [PATCH] [ssh-agent] Fix support for rsa1 keys
-
-Read the comment, instead of ignoring it and using the bytes as if they
-were constraints.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=597813
----
- pkcs11/ssh-agent/gck-ssh-agent-ops.c |   14 ++++++++++++++
- 1 files changed, 14 insertions(+), 0 deletions(-)
-
-diff --git a/pkcs11/ssh-agent/gck-ssh-agent-ops.c b/pkcs11/ssh-agent/gck-ssh-agent-ops.c
-index d3507f4..c02c43e 100644
---- a/pkcs11/ssh-agent/gck-ssh-agent-ops.c
-+++ b/pkcs11/ssh-agent/gck-ssh-agent-ops.c
-@@ -685,6 +685,7 @@ op_v1_add_identity (GckSshAgentCall *call)
- {
- 	GP11Attributes *pub, *priv;
- 	GP11Session *session;
-+	gchar *comment = NULL;
- 	gboolean ret;
- 	gsize offset = 5;	
- 	guint32 unused;
-@@ -702,6 +703,19 @@ op_v1_add_identity (GckSshAgentCall *call)
- 		return FALSE;		
- 	}
- 	
-+	/* Get the comment */
-+	if (!egg_buffer_get_string (call->req, offset, &offset, &comment, (EggBufferAllocator)g_realloc)) {
-+		gp11_attributes_unref (pub);
-+		gp11_attributes_unref (priv);
-+		return FALSE;
-+	}
-+
-+	/*
-+	gp11_attributes_add_string (pub, CKA_LABEL, comment);
-+	gp11_attributes_add_string (priv, CKA_LABEL, comment);
-+	*/
-+	g_free (comment);
-+
- 	gp11_attributes_add_string (priv, CKA_LABEL, V1_LABEL);
- 	gp11_attributes_add_string (pub, CKA_LABEL, V1_LABEL);
- 	
--- 
-1.6.4.2
\ No newline at end of file
diff --git a/sources b/sources
index 2277331..cef706d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-07fa253d8506c22640d74eb4fc90a092  gnome-keyring-2.28.0.tar.bz2
+1139f46c99a1b0c01009ed2eae3f4a0a  gnome-keyring-2.28.1.tar.bz2