diff --git a/.cvsignore b/.cvsignore
index 86a88fc..3135baa 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gedit-2.29.8.tar.bz2
+gedit-2.29.9.tar.bz2
diff --git a/gedit.spec b/gedit.spec
index d84fea9..625ce6b 100644
--- a/gedit.spec
+++ b/gedit.spec
@@ -14,11 +14,12 @@
 
 Summary:	Text editor for the GNOME desktop
 Name:		gedit
-Version: 	2.29.8
+Version: 	2.29.9
 Release: 	1%{?dist}
 Epoch:		1
 License:	GPLv2+ and GFDL
 Group:		Applications/Editors
+#VCS: git:git://git.gnome.org/gedit
 Source0:	http://download.gnome.org/sources/gedit/2.29/gedit-%{version}.tar.bz2
 
 URL:		http://projects.gnome.org/gedit/
@@ -44,9 +45,6 @@ Patch2: gedit-2.25.5-fix-python-path.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=587053
 Patch3: print-to-file.patch
 
-# https://bugzilla.gnome.org/show_bug.cgi?id=609562
-Patch4: 0001-Fix-libm-and-libX11-linking.patch
-
 BuildRequires: gnome-common
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -113,7 +111,6 @@ Install gedit-devel if you want to write plugins for gedit.
 
 %patch2 -p1 -b .fix-python-path
 %patch3 -p1 -b .print-to-file
-%patch4 -p1 -b .libm
 
 autoreconf -f -i
 intltoolize -f
@@ -229,6 +226,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
 
 
 %changelog
+* Sun Mar 28 2010 Matthias Clasen <mclasen@redhat.com> - 2.29.9-1
+- Update to 2.29.9
+
+* Mon Mar  8 2010 Matthias Clasen <mclasen@redhat.com> - 2.29.8-2
+- Fix some "(null)" error messages
+
 * Tue Mar  2 2010 Matthias Clasen <mclasen@redhat.com> - 2.29.8-1
 - Update to 2.29.8
 
diff --git a/missing-message.patch b/missing-message.patch
new file mode 100644
index 0000000..9e7d12b
--- /dev/null
+++ b/missing-message.patch
@@ -0,0 +1,18 @@
+diff -up gedit-2.29.8/gedit/gedit-io-error-message-area.c.missing-message gedit-2.29.8/gedit/gedit-io-error-message-area.c
+--- gedit-2.29.8/gedit/gedit-io-error-message-area.c.missing-message	2010-03-08 13:59:23.179942638 -0500
++++ gedit-2.29.8/gedit/gedit-io-error-message-area.c	2010-03-08 13:58:32.470689390 -0500
+@@ -635,10 +635,14 @@ gedit_io_loading_error_message_area_new 
+ 
+ 	if (is_gio_error (error, G_IO_ERROR_TOO_MANY_LINKS))
+ 	{
++		error_message = g_strdup_printf (_("There was a problem opening the file %s."),
++						 uri_for_display);
+ 		message_details = g_strdup (_("The number of followed links is limited and the actual file could not be found within this limit."));
+ 	}
+ 	else if (is_gio_error (error, G_IO_ERROR_PERMISSION_DENIED))
+ 	{
++		error_message = g_strdup_printf (_("There was a problem opening the file %s."),
++						 uri_for_display);
+ 		message_details = g_strdup (_("You do not have the permissions necessary to open the file."));
+ 	}
+ 	else if ((is_gio_error (error, G_IO_ERROR_INVALID_DATA) && encoding == NULL) ||
diff --git a/sources b/sources
index 5494f51..81a0d73 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4da5d24fc6cb67a0fa7c12d0b4dba0c9  gedit-2.29.8.tar.bz2
+68719e36f5a47c4e6794f16565b50e78  gedit-2.29.9.tar.bz2