diff --git a/evolution-2.11.3-fix-invalid-free.patch b/evolution-2.11.3-fix-invalid-free.patch
new file mode 100644
index 0000000..45a7937
--- /dev/null
+++ b/evolution-2.11.3-fix-invalid-free.patch
@@ -0,0 +1,11 @@
+--- evolution-2.11.3/mail/em-folder-view.c.fix-invalid-free	2007-06-05 15:20:42.000000000 -0400
++++ evolution-2.11.3/mail/em-folder-view.c	2007-06-05 15:20:51.000000000 -0400
+@@ -2930,7 +2930,7 @@ emfv_on_url_cb (GObject *emitter, const 
+ 			camel_url_free(curl);
+ 			camel_object_unref(cia);
+ 		} else if (!strncmp (url, "##", 2)) {
+-			nice_url = _("Click to hide/unhide addresses");
++			nice_url = g_strdup (_("Click to hide/unhide addresses"));
+ 		} else
+ 			nice_url = g_strdup_printf (_("Click to open %s"), url);
+ 	}
diff --git a/evolution.spec b/evolution.spec
index 01393f1..2167cef 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -45,7 +45,7 @@
 
 Name: evolution
 Version: 2.11.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -134,6 +134,9 @@ Patch34: evolution-2.10.0-e-source-combo-box.patch
 # Upstream really needs to use -Werror-implicit-function-declaration.
 Patch35: evolution-2.11.3-implicit-function-declaration.patch
 
+# Fix an invalid free in em-folder-view.c
+Patch36: evolution-2.11.3-fix-invalid-free.patch
+
 ## Dependencies ###
 
 Requires(post): GConf2
@@ -274,6 +277,7 @@ Development files needed for building things which link against evolution.
 %patch33 -p1 -b .e-passwords
 %patch34 -p1 -b .e-source-combo-box
 %patch35 -p1 -b .implicit-function-declaration
+%patch36 -p1 -b .fix-invalid-free
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -707,6 +711,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Tue Jun 05 2007 Matthew Barnes <mbarnes@redhat.com> - 2.11.3-2.fc8
+- Fix an invalid g_free() that was causing lock-ups.
+
 * Mon Jun 04 2007 Matthew Barnes <mbarnes@redhat.com> - 2.11.3-1.fc8
 - Update to 2.11.3
 - Evolution no longer has versioned file names.