diff --git a/seahorse-2.29.3.tar.bz2 b/seahorse-2.29.3.tar.bz2
deleted file mode 100644
index 7c04859..0000000
--- a/seahorse-2.29.3.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:200908a69454e389b0e88de70eb11c9642ec81a6678129b2f4700af19cd04016
-size 2395599
diff --git a/seahorse-2.29.4.tar.bz2 b/seahorse-2.29.4.tar.bz2
new file mode 100644
index 0000000..e942a77
--- /dev/null
+++ b/seahorse-2.29.4.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:760bbd0606e9fee0847440290d1552e2f200c9ab83197a8d22e8b06a25b64f9c
+size 2396936
diff --git a/seahorse-missing-sentinel.patch b/seahorse-missing-sentinel.patch
new file mode 100644
index 0000000..800483b
--- /dev/null
+++ b/seahorse-missing-sentinel.patch
@@ -0,0 +1,13 @@
+Index: seahorse-2.29.4/pgp/seahorse-gpg-options.c
+===================================================================
+--- seahorse-2.29.4.orig/pgp/seahorse-gpg-options.c
++++ seahorse-2.29.4/pgp/seahorse-gpg-options.c
+@@ -215,7 +215,7 @@ parse_home_directory (gpgme_engine_info_
+ 
+                     /* 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);
+                     }
diff --git a/seahorse.changes b/seahorse.changes
index 96ecf14..c54a8aa 100644
--- a/seahorse.changes
+++ b/seahorse.changes
@@ -1,3 +1,24 @@
+-------------------------------------------------------------------
+Thu Dec 24 15:29:57 CET 2009 - vuntz@opensuse.org
+
+- Update to version 2.29.4:
+  + Experimental support for introspection of libcryptui
+  + Full documentation for seahorse-context.c
+  + Do not use fixed MAXPATHLEN size buffers for portability
+  + Add seahorse man page
+  + Fix build with latest gp11
+  + Updated translations.
+- Add seahorse-missing-sentinel.patch to fix build.
+
+-------------------------------------------------------------------
+Wed Dec 23 10:55:20 CET 2009 - vuntz@opensuse.org
+
+- Change gnome-keyring-devel BuildRequires to
+  libgnome-keyring-devel, following the module split upstream.
+- Add libgcr-devel and libgp11-devel BuildRequires, that used to
+  live with gnome-keyring-devel.
+- Pass --disable-schemas-install to configure.
+
 -------------------------------------------------------------------
 Wed Dec  2 23:38:43 CET 2009 - vuntz@opensuse.org
 
diff --git a/seahorse.spec b/seahorse.spec
index dafa55c..1c472cd 100644
--- a/seahorse.spec
+++ b/seahorse.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package seahorse (Version 2.29.3)
+# spec file for package seahorse (Version 2.29.4)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -22,11 +22,13 @@ Name:           seahorse
 BuildRequires:  fdupes
 BuildRequires:  gconf2-devel
 BuildRequires:  gnome-doc-utils-devel
-BuildRequires:  gnome-keyring-devel
 BuildRequires:  gpg2
 BuildRequires:  gpgme-devel
 BuildRequires:  intltool
 BuildRequires:  libavahi-glib-devel
+BuildRequires:  libgcr-devel
+BuildRequires:  libgnome-keyring-devel
+BuildRequires:  libgp11-devel
 BuildRequires:  libgpg-error-devel
 BuildRequires:  libnotify-devel
 BuildRequires:  libsoup-devel
@@ -37,13 +39,15 @@ BuildRequires:  translation-update-upstream
 BuildRequires:  update-desktop-files
 License:        GPLv2+
 Group:          Productivity/Security
-Version:        2.29.3
+Version:        2.29.4
 Release:        1
 Requires:       %{name}-lang = %{version}
 Summary:        GNOME2 interface for gnupg
 Source:         ftp://ftp.gnome.org/pub/gnome/sources/seahorse/%{name}-%{version}.tar.bz2
 # PATCH-FIX-OPENSUSE seahorse-xsltproc-nonet.patch
 Patch1:         seahorse-xsltproc-nonet.patch
+# PATCH-FIX-UPSTREAM seahorse-missing-sentinel.patch bgo#605367 vuntz@opensuse.org -- Fix build
+Patch2:         seahorse-missing-sentinel.patch
 Url:            http://seahorse.sourceforge.net/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %gconf_schemas_prereq
@@ -66,9 +70,12 @@ Seahorse is a gnome2 interface for gnupg. It uses gpgme as the backend.
 %setup
 translation-update-upstream
 %patch1 -p1
+%patch2 -p1
 
 %build
-%configure --disable-scrollkeeper
+%configure \
+        --disable-scrollkeeper \
+        --disable-schemas-install
 make %{?jobs:-j%jobs}
 
 %install