diff --git a/evolution-data-server-2.27.3-category-crash.patch b/evolution-data-server-2.27.3-category-crash.patch
new file mode 100644
index 0000000..ff08f95
--- /dev/null
+++ b/evolution-data-server-2.27.3-category-crash.patch
@@ -0,0 +1,11 @@
+diff -up evolution-data-server-2.27.3/libedataserver/e-categories.c.category-crash evolution-data-server-2.27.3/libedataserver/e-categories.c
+--- evolution-data-server-2.27.3/libedataserver/e-categories.c.category-crash	2009-06-12 08:20:13.000000000 -0400
++++ evolution-data-server-2.27.3/libedataserver/e-categories.c	2009-07-02 22:23:01.000000000 -0400
+@@ -399,6 +399,7 @@ load_default_categories (void)
+ 			gettext (cat_info->category),
+ 			NULL, icon_file, TRUE);
+ 		g_free (icon_file);
++		icon_file = NULL;
+ 		cat_info++;
+ 	}
+ }
diff --git a/evolution-data-server.spec b/evolution-data-server.spec
index b835e34..77f4123 100644
--- a/evolution-data-server.spec
+++ b/evolution-data-server.spec
@@ -28,7 +28,7 @@
 
 Name: evolution-data-server
 Version: 2.27.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
 License: LGPLv2+
@@ -50,6 +50,9 @@ Patch11: evolution-data-server-1.10.1-camel-folder-summary-crash.patch
 # RH bug #243296
 Patch12: evolution-data-server-1.11.5-fix-64bit-acinclude.patch
 
+# RH bug #505661 / GNOME bug #587165
+Patch13: evolution-data-server-2.27.3-category-crash.patch
+
 ### Build Dependencies ###
 
 BuildRequires: GConf2-devel
@@ -133,6 +136,7 @@ This package contains developer documentation for %{name}.
 %patch10 -p1 -b .fix-ldap-query
 %patch11 -p1 -b .camel-folder-summary-crash
 %patch12 -p1 -b .fix-64bit-acinclude
+%patch13 -p1 -b .category-crash
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -361,6 +365,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/libedataserverui
 
 %changelog
+* Thu Jul 02 2009 Matthew Barnes <mbarnes@redhat.com> - 2.27.3-3.fc12
+- Add patch for RH bug #505661 (crash on startup).
+
 * Wed Jul 01 2009 Milan Crha <mcrha@redhat.com> - 2.27.3-2.fc12
 - Rebuild against newer gcc