diff --git a/evolution.spec b/evolution.spec
index 792445f..5d405de 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -29,7 +29,7 @@
 
 Name: evolution
 Version: 2.91.5
-Release: 3%{?dist}
+Release: 4%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -48,6 +48,9 @@ Patch10: evolution-1.4.4-ldap-x86_64-hack.patch
 # RH bug #589555
 Patch13: evolution-2.30.1-help-contents.patch
 
+# RH bug #657254  bgo #638808
+Patch20: evo-2.91.5-finish-tasks-before-camel-shutdown.patch
+
 ## Dependencies ###
 
 Requires(pre): GConf2
@@ -200,6 +203,7 @@ This package contains the plugin to import Microsoft Personal Storage Table
 %setup -q -n evolution-%{version}
 %patch10 -p1 -b .ldaphack
 %patch13 -p1 -b .help-contents
+%patch20 -p1 -b .camel-shutdown-later
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -600,6 +604,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Fri Jan 21 2011 Dan Williams <dcbw@redhat.com> - 2.91.5-4
+- Fix crash at shutdown by finishing tasks before cleaning up (rh #657254)
+
 * Tue Jan 18 2011 Matthias Clasen <mclasen@redhat.com> - 2.91.5-3
 - Rebuild against newer libgdata