diff --git a/.cvsignore b/.cvsignore
index 608895c..274a483 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,6 +1 @@
-evolution-2.9.4.tar.bz2
-evolution16.png
-evolution22.png
-evolution24.png
-evolution32.png
-evolution.svg
+evolution-2.9.5.tar.bz2
diff --git a/evolution.spec b/evolution.spec
index 23276ae..d770c39 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -43,8 +43,8 @@
 ### Abstract ###
 
 Name: evolution
-Version: 2.9.4
-Release: 4%{?dist}
+Version: 2.9.5
+Release: 1%{?dist}
 License: GPL
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -139,36 +139,26 @@ Patch34: evolution-2.9.1-first-ascii.patch
 # GNOME bug #373837
 Patch35: evolution-2.9.2-gtk-font-button.patch
 
-# Port evolution conduits to pilot-link 0.12
-# http://mail.gnome.org/archives/evolution-patches/2006-August/msg00083.html
-Patch36: evolution-2.9.2-pilot-link-0.12.patch
-
-# RH bug #215466 / RH bug #218589 / GNOME bug #377511
-Patch37: evolution-2.9.2-optional-participant.patch
-
-# RH bug #215695 / GNOME bug #383027
-Patch39: evolution-2.9.3-dont-assume-default-account.patch
-
 # RH bug #216537 / GNOME bug #383047
-#Patch40: evolution-2.9.3-view-attachment-uri.patch
+#Patch36: evolution-2.9.3-view-attachment-uri.patch
 
 # GNOME bug #350253
-Patch41: evolution-2.9.3-adopt-icons.patch
+Patch37: evolution-2.9.3-adopt-icons.patch
 
 # RH bug #215478 / GNOME bug #383842
-Patch42: evolution-2.9.3-source-path-entry.patch
+Patch38: evolution-2.9.3-source-path-entry.patch
 
 # RH bug #218801 / GNOME bug #383953
-Patch43: evolution-2.9.3-unread-messages.patch
+Patch39: evolution-2.9.3-unread-messages.patch
 
 # RH bug #215467 / GNOME bug #380644
-Patch44: evolution-2.9.3-meeting-list-view.patch
+Patch40: evolution-2.9.3-meeting-list-view.patch
 
 # GNOME bug #373116
-Patch45: evolution-2.9.3-gtk-color-button.patch
+Patch41: evolution-2.9.3-gtk-color-button.patch
 
 # GNOME bug #218898
-Patch46: evolution-2.9.4-view-message-source.patch
+Patch42: evolution-2.9.4-view-message-source.patch
 
 ## Dependencies ###
 
@@ -309,16 +299,13 @@ Development files needed for building things which link against evolution.
 %patch33 -p1 -b .im-context-reset
 %patch34 -p1 -b .first-ascii
 %patch35 -p1 -b .gtk-font-button
-%patch36 -p1 -b .pilot-link-0.12
-%patch37 -p1 -b .optional-participant
-%patch39 -p1 -b .dont-assume-default-account
-#%patch40 -p1 -b .view-attachment-uri
-%patch41 -p1 -b .adopt-icons
-%patch42 -p1 -b .source-path-entry
-%patch43 -p1 -b .unread-messages
-%patch44 -p1 -b .meeting-list-view
-%patch45 -p1 -b .gtk-color-button
-%patch46 -p1 -b .view-message-source
+#%patch36 -p1 -b .view-attachment-uri
+%patch37 -p1 -b .adopt-icons
+%patch38 -p1 -b .source-path-entry
+%patch39 -p1 -b .unread-messages
+%patch40 -p1 -b .meeting-list-view
+%patch41 -p1 -b .gtk-color-button
+%patch42 -p1 -b .view-message-source
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -734,6 +721,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Mon Jan 08 2008 Matthew Barnes <mbarnes@redhat.com> - 2.9.5-1.fc7
+- Update to 2.9.5
+- Remove pilot-link-0.12 patch (fixed upstream).
+- Remove patch for RH bug #215466 and #218589 (fixed upstream).
+- Remove patch for RH bug #215695 (fixed upstream).
+
 * Sat Dec 30 2006 Matthew Barnes <mbarnes@redhat.com> - 2.9.4-4.fc7
 - Add Requires evolution-data-server-devel to devel subpackage
   (RH bug #218889).
diff --git a/sources b/sources
index 0b1ade0..7a883ab 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-8915ed5f5b4c0351f05a428111b46216  evolution-2.9.4.tar.bz2
+ef0c0eaff9fc7c3372bcac947d0cb0b8  evolution-2.9.5.tar.bz2
 4737f9b111e5e4b2fccc9e9b464c4b01  evolution16.png
 de663fa442d61f53dc058dd20c77da8e  evolution22.png
 d33896d33b5db2201e051664e96b1100  evolution24.png