diff --git a/.cvsignore b/.cvsignore
index 1785168..a134d8a 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-seahorse-2.29.4.tar.bz2
+seahorse-2.29.90.tar.bz2
diff --git a/property-get.patch b/property-get.patch
deleted file mode 100644
index 3e60162..0000000
--- a/property-get.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -up seahorse-2.28.1/src/seahorse-key-manager-store.c.property-get seahorse-2.28.1/src/seahorse-key-manager-store.c
---- seahorse-2.28.1/src/seahorse-key-manager-store.c.property-get	2009-12-14 08:48:11.767890524 -0500
-+++ seahorse-2.28.1/src/seahorse-key-manager-store.c	2009-12-14 08:48:46.853113546 -0500
-@@ -407,13 +407,14 @@ xds_get_atom_value (GdkDragContext *cont
- 	g_return_val_if_fail (context != NULL, NULL);
- 	g_return_val_if_fail (context->source_window != NULL, NULL);
- 
--	gdk_property_get (context->source_window,
--			  XDS_ATOM, TEXT_ATOM,
--			  0, MAX_XDS_ATOM_VAL_LEN,
--			  FALSE, NULL, NULL, NULL,
--			  (unsigned char **) &ret);
-+	if (gdk_property_get (context->source_window,
-+			      XDS_ATOM, TEXT_ATOM,
-+			      0, MAX_XDS_ATOM_VAL_LEN,
-+			      FALSE, NULL, NULL, NULL,
-+			      (unsigned char **) &ret))
-+		return ret;
- 
--	return ret;
-+	return NULL;
- }
- 
- static gboolean
diff --git a/seahorse-2.29.4-missing-null.patch b/seahorse-2.29.4-missing-null.patch
deleted file mode 100644
index 81bace0..0000000
--- a/seahorse-2.29.4-missing-null.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From e329c309f8330c140acb86d270f531f2fc1cca64 Mon Sep 17 00:00:00 2001
-From: Vincent Untz <vuntz@gnome.org>
-Date: Tue, 29 Dec 2009 17:46:50 +0000
-Subject: Fixed bad usage of g_strconcat: missing NULL
-
-Closes: bgo#605367
----
-diff --git a/pgp/seahorse-gpg-options.c b/pgp/seahorse-gpg-options.c
-index 9a37d9b..aa6158d 100644
---- a/pgp/seahorse-gpg-options.c
-+++ b/pgp/seahorse-gpg-options.c
-@@ -215,7 +215,7 @@ parse_home_directory (gpgme_engine_info_t engine, GError **err)
- 
-                     /* If it's not a rooted path then expand */
-                     if (t[0] == '~') {
--                        gpg_homedir = g_strconcat (g_get_home_dir(), ++t);
-+                        gpg_homedir = g_strconcat (g_get_home_dir(), ++t, NULL);
-                     } else {
-                         gpg_homedir = g_strdup (t);
-                     }
---
-cgit v0.8.3.1
diff --git a/seahorse.spec b/seahorse.spec
index 9073b8e..0697202 100644
--- a/seahorse.spec
+++ b/seahorse.spec
@@ -1,6 +1,6 @@
 Name: 		seahorse
-Version: 	2.29.4
-Release:        2%{?dist}
+Version: 	2.29.90
+Release:        1%{?dist}
 Summary:	A GNOME application for managing encryption keys
 Group: 		User Interface/Desktops
 # seahorse is GPLv2+
@@ -24,7 +24,7 @@ BuildRequires:  libnotify-devel
 BuildRequires:  openssh-clients
 BuildRequires:  gnome-doc-utils >= 0.3.2
 BuildRequires:  libgnome-keyring-devel
-BuildRequires:  gnome-keyring-devel >= 2.25.5
+BuildRequires:  gnome-keyring-devel >= 2.29.4
 BuildRequires:  avahi-devel
 BuildRequires:  avahi-glib-devel
 BuildRequires:  intltool
@@ -46,11 +46,6 @@ Requires:       pinentry-gtk
 
 Obsoletes: gnome-keyring-manager
 
-# https://bugzilla.gnome.org/show_bug.cgi?id=604541 
-Patch0: property-get.patch
-# from upstream
-Patch1: seahorse-2.29.4-missing-null.patch
-
 %description
 Seahorse is a graphical interface for managing and using encryption keys.
 It also integrates with nautilus, gedit and other places for encryption
@@ -70,8 +65,6 @@ library that belongs to seahorse.
 
 %prep
 %setup -q
-%patch0 -p1 -b .property-get
-%patch1 -p1 -b .missing-null
 
 %build
 GNUPG=/usr/bin/gpg2 ; export GNUPG ; %configure --disable-scrollkeeper
@@ -166,7 +159,6 @@ fi
 %{_libdir}/libcryptui*.so.*
 %config(noreplace) %{_sysconfdir}/gconf/schemas/*
 %{_datadir}/dbus-1/services/org.gnome.seahorse.service
-%{_sysconfdir}/xdg/autostart/seahorse-daemon.desktop
 %{_libdir}/girepository-1.0
 
 %files devel
@@ -179,6 +171,10 @@ fi
 %{_datadir}/gir-1.0
 
 %changelog
+* Tue Feb  9 2010 Tomas Bzatek <tbzatek@redhat.com> 2.29.90-1
+- Update to 2.29.90
+- Removed daemon autostart file (upstream)
+
 * Fri Jan  8 2010 Tomas Bzatek <tbzatek@redhat.com> 2.29.4-2
 - Fix bad usage of g_strconcat: missing NULL (#553647)
 
diff --git a/sources b/sources
index 387e3f3..628a53c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c66b176d2c18664811af5af8231666f7  seahorse-2.29.4.tar.bz2
+b9e359e79046e850d7f41e5022750669  seahorse-2.29.90.tar.bz2