diff --git a/seahorse-2.29.4-missing-null.patch b/seahorse-2.29.4-missing-null.patch
new file mode 100644
index 0000000..81bace0
--- /dev/null
+++ b/seahorse-2.29.4-missing-null.patch
@@ -0,0 +1,22 @@
+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 a43fc07..9073b8e 100644
--- a/seahorse.spec
+++ b/seahorse.spec
@@ -1,6 +1,6 @@
 Name: 		seahorse
 Version: 	2.29.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:	A GNOME application for managing encryption keys
 Group: 		User Interface/Desktops
 # seahorse is GPLv2+
@@ -48,6 +48,8 @@ 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.
@@ -69,6 +71,7 @@ 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
@@ -176,6 +179,9 @@ fi
 %{_datadir}/gir-1.0
 
 %changelog
+* Fri Jan  8 2010 Tomas Bzatek <tbzatek@redhat.com> 2.29.4-2
+- Fix bad usage of g_strconcat: missing NULL (#553647)
+
 * Thu Jan  7 2010 Tomas Bzatek <tbzatek@redhat.com> 2.29.4-1
 - Update to 2.29.4