diff --git a/.cvsignore b/.cvsignore
index 0bf87e1..b47e44a 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-evolution-data-server-1.9.4.tar.bz2
+evolution-data-server-1.9.5.tar.bz2
diff --git a/evolution-data-server.spec b/evolution-data-server.spec
index d942748..adb27da 100644
--- a/evolution-data-server.spec
+++ b/evolution-data-server.spec
@@ -24,7 +24,7 @@
 ### Abstract ###
 
 Name: evolution-data-server
-Version: 1.9.4
+Version: 1.9.5
 Release: 1%{?dist}
 License: LGPL
 Group: System Environment/Libraries
@@ -59,23 +59,17 @@ Patch19: evolution-data-server-1.8.1-warn-unused-variable.patch
 # GNOME bug #360619
 Patch20: evolution-data-server-1.8.1-warn-incompatible-pointer-type.patch
 
-# GNOME bug #362638
-Patch21: evolution-data-server-1.8.1-kill-ethread.patch
-
 # GNOME bug #363965
-Patch22: evolution-data-server-1.9.1-kill-ememory.patch
+Patch21: evolution-data-server-1.9.1-kill-ememory.patch
 
 # RH bug #203058
-Patch23: evolution-data-server-1.9.2-fix-name-selector-dialog.patch
+Patch22: evolution-data-server-1.9.2-fix-name-selector-dialog.patch
 
 # RH bug #210142
-Patch24: evolution-data-server-1.9.2-strftime.patch
+Patch23: evolution-data-server-1.9.2-strftime.patch
 
 # GNOME bug #373117
-Patch25: evolution-data-server-1.9.3-e-source-color.patch
-
-# GNOME bug #387638
-Patch26: evolution-data-server-1.9.4-implicit-function-declaration.patch
+Patch24: evolution-data-server-1.9.3-e-source-color.patch
 
 ### Dependencies ###
 
@@ -164,12 +158,10 @@ evolution-data-server.
 %patch18 -p1 -b .kill-emutex
 %patch19 -p1 -b .warn-unused-variable
 %patch20 -p1 -b .warn-incompatible-pointer-type
-%patch21 -p1 -b .kill-ethread
-%patch22 -p1 -b .kill-ememory
-%patch23 -p1 -b .fix-name-selector-dialog
-%patch24 -p1 -b .strftime
-%patch25 -p1 -b .e-source-color
-%patch26 -p1 -b .implicit-function-declaration
+%patch21 -p1 -b .kill-ememory
+%patch22 -p1 -b .fix-name-selector-dialog
+%patch23 -p1 -b .strftime
+%patch24 -p1 -b .e-source-color
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -387,6 +379,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libexchange-storage-%{eds_api_version}.pc
 
 %changelog
+* Mon Jan 08 2007 Matthew Barnes <mbarnes@redhat.com> - 1.9.5-1.fc7
+- Update to 1.9.5
+- Remove patch for GNOME bug #362638 (fixed upstream).
+- Remove patch for GNOME bug #387638 (fixed upstream).
+
 * Tue Dec 19 2006 Matthew Barnes <mbarnes@redhat.com> - 1.9.4-1.fc7
 - Update to 1.9.4
 - Add patch for GNOME bug #373117 (storing color settings).
diff --git a/sources b/sources
index 0fbd092..cbec6ad 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b1a214fc8c169deec8d74acb0d0c4398  evolution-data-server-1.9.4.tar.bz2
+94993e32e53663558e1eecea3f432bd5  evolution-data-server-1.9.5.tar.bz2