diff --git a/.cvsignore b/.cvsignore
index 8bd48e1..23cc717 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-evolution-2.8.1.tar.bz2
+evolution-2.9.1.tar.bz2
diff --git a/evolution.spec b/evolution.spec
index 2297597..92a31bf 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -1,7 +1,7 @@
 %define bug_buddy_version 2.15.90
 %define dbus_glib_version 0.70
 %define dbus_version 0.90
-%define eds_version 1.8.0
+%define eds_version 1.9.1
 %define gnome_icon_theme_version 1.3.6
 %define gnome_pilot_version 2.0.13
 %define gnomevfs2_version 2.4
@@ -14,7 +14,7 @@
 %define redhat_menus_version 5.0.4
 %define soup_version 2.2.2
 
-%define evo_major 2.8
+%define evo_major 2.10
 
 %define exchange_support 1
 %define inline_audio_support 0
@@ -42,8 +42,8 @@
 ### Abstract ###
 
 Name: evolution
-Version: 2.8.1
-Release: 4%{?dist}
+Version: 2.9.1
+Release: 1%{?dist}
 License: GPL
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -118,9 +118,6 @@ Patch29: evolution-2.8.0-more-deprecated.patch
 # RH bug #202751 / Gnome.org bug #355766
 Patch30: evolution-2.8.0-fix-indic-printing.patch
 
-# Gnome.org bug #359236
-Patch31: evolution-2.8.1-fix-search-state-crash.patch
-
 # Gnome.org bug #360240
 Patch32: evolution-2.8.1-warn-unused-variable.patch
 
@@ -265,7 +262,6 @@ Development files needed for building things which link against evolution.
 %patch28 -p1 -b .deprecated-gdk-font
 %patch29 -p1 -b .more-deprecated
 %patch30 -p1 -b .fix-indic-printing
-%patch31 -p1 -b .fix-search-state-crash
 %patch32 -p1 -b .warn-unused-variable
 %patch33 -p1 -b .warn-incompatible-pointer-type
 %patch34 -p1 -b .about-dialog
@@ -390,10 +386,15 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/gnome-pilot/conduits/*.la
 # scrollkeeper gets handled in %post
 rm -rf $RPM_BUILD_ROOT/var/scrollkeeper
 
-# evolution is the preferred email app
-for desktopfile in $RPM_BUILD_ROOT%{_datadir}/desktop-menu-patches/*-evolution-*.desktop; do
-    ln -sf $desktopfile $RPM_BUILD_ROOT%{_datadir}/applications/
-done
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
+ln -sf %{_datadir}/desktop-menu-patches/redhat-evolution-mail.desktop \
+  $RPM_BUILD_ROOT/%{_datadir}/applications/redhat-evolution-mail.desktop
+ln -sf %{_datadir}/desktop-menu-patches/redhat-evolution-calendar.desktop \
+  $RPM_BUILD_ROOT/%{_datadir}/applications/redhat-evolution-calendar.desktop
+ln -sf %{_datadir}/desktop-menu-patches/redhat-evolution-contacts.desktop \
+  $RPM_BUILD_ROOT/%{_datadir}/applications/redhat-evolution-contacts.desktop
+ln -sf %{_datadir}/desktop-menu-patches/redhat-evolution-tasks.desktop \
+  $RPM_BUILD_ROOT/%{_datadir}/applications/redhat-evolution-tasks.desktop
 
 # remove upstream desktop file; use the symlinks from above (#103826)
 rm -f $RPM_BUILD_ROOT/%{_datadir}/applications/evolution-%{evo_major}.desktop
@@ -664,6 +665,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Mon Oct 16 2006 Matthew Barnes <mbarnes@redhat.com> - 2.9.1-1.fc7
+- Update to 2.9.1
+- Bump eds_version to 1.9.1, evo_major to 2.10.
+- Remove patch for Gnome.org bug #359236 (fixed upstream).
+
 * Mon Oct 16 2006 Matthew Barnes <mbarnes@redhat.com> - 2.8.1-4.fc7
 - Another typo.
 
diff --git a/sources b/sources
index fd19c09..b27a08e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6a08d1121bc126c4ed7035ab94a09871  evolution-2.8.1.tar.bz2
+e7e6492d80a7405bd34568fc78074cbe  evolution-2.9.1.tar.bz2