diff --git a/.cvsignore b/.cvsignore
index 643786e..45e017d 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-evolution-2.5.5.1.tar.bz2
+evolution-2.5.90.tar.bz2
diff --git a/evolution.spec b/evolution.spec
index 30961bf..21dadd7 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -37,8 +37,8 @@
 %define evo_plugin_dir %{_libdir}/evolution/%{evo_major}/plugins
 
 Name: evolution
-Version: 2.5.5.1
-Release: 2
+Version: 2.5.90
+Release: 1
 License: GPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://www.ximian.com/
@@ -551,7 +551,6 @@ 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
@@ -625,6 +624,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Mon Jan 30 2006 David Malcolm <dmalcolm@redhat.com> - 2.5.90-1
+- 2.5.90
+- trimmed patches 805 and 808, as parts of these got merged upstream
+- trimmed and regenerated patch 806 to track upstream
+- removed the mail-to-task plugin XML UI file
+
 * Sat Jan 28 2006 David Malcolm <dmalcolm@redhat.com> - 2.5.5.1-2
 - added missing patch
 
diff --git a/sources b/sources
index 1d903f9..87dd98b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-307c20ef482dafe90c7f55843e473cda  evolution-2.5.5.1.tar.bz2
+02751eb28ad9b31402290ed4816e5321  evolution-2.5.90.tar.bz2