diff --git a/.cvsignore b/.cvsignore
index 45e017d..34682a7 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-evolution-2.5.90.tar.bz2
+evolution-2.5.91.tar.bz2
diff --git a/evolution.spec b/evolution.spec
index 95663bb..ac103d3 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -38,8 +38,8 @@
 %define evo_plugin_dir %{_libdir}/evolution/%{evo_major}/plugins
 
 Name: evolution
-Version: 2.5.90
-Release: 2.1
+Version: 2.5.91
+Release: 1
 License: GPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://www.ximian.com/
@@ -57,7 +57,7 @@ Patch98: evolution-1.4.4-ldap-x86_64-hack.patch
 
 # patches sent upstream
 Patch100: evo-addressbook-print-with-pango-2.patch
-Patch101: evo-calendar-print-with-pango-6.patch
+Patch101: evo-calendar-print-with-pango-7.patch
 
 #Patch104: evolution-2.2.0-port-to-pilot-link-0.12.patch
 
@@ -99,7 +99,6 @@ Patch803: evolution-2.5.2-no-gnome-common.patch
 Patch804: evolution-2.4.1-fix-missing-declarations.patch
 Patch805: evolution-2.5.4-fix-missing-declarations.patch
 Patch806: evolution-2.5.5.1-notification-cleanups.patch
-Patch807: evolution-2.5.4-fix-nm-multiple-init.patch
 Patch808: evolution-2.5.5.1-fix-missing-declarations-2.5.5.1.patch
 
 Summary: GNOME's next-generation groupware suite
@@ -244,7 +243,6 @@ cd ../..
 %patch804 -p1 -b .fix-missing-declarations
 %patch805 -p1 -b .fix-missing-declarations-2-5-4
 %patch806 -p1 -b .notification-cleanups
-%patch807 -p1 -b .fix-nm-multiple-init
 %patch808 -p1 -b .fix-missing-declarations-2.5.5.1
 
 mkdir -p krb5-fakeprefix/include
@@ -562,6 +560,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %{evo_plugin_dir}/org-gnome-mail-to-task.eplug
 %{evo_plugin_dir}/liborg-gnome-mail-to-task.so
+%{evo_plugin_dir}/org-gnome-mail-to-task.xml
 
 %{evo_plugin_dir}/org-gnome-mark-all-read.eplug
 %{evo_plugin_dir}/liborg-gnome-mark-all-read.so
@@ -635,6 +634,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Tue Feb 14 2006 David Malcolm <dmalcolm@redhat.com> - 2.5.91-1
+- 2.5.91
+- updated patch 101 to track upstream changes to calendar printing code
+- remove uptreamed patch 807 (NM multiple initialization assertion)
+- readded the mail-to-task plugin XML UI file
+
 * Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 2.5.90-2.1
 - bump again for double-long bug on ppc(64)
 
diff --git a/sources b/sources
index 87dd98b..6121080 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-02751eb28ad9b31402290ed4816e5321  evolution-2.5.90.tar.bz2
+cea13421ea95707e89c0311100714573  evolution-2.5.91.tar.bz2