diff --git a/evolution-data-server.spec b/evolution-data-server.spec
index 13c6c8b..0344b81 100644
--- a/evolution-data-server.spec
+++ b/evolution-data-server.spec
@@ -22,7 +22,7 @@
 
 Name: evolution-data-server
 Version: 1.8.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
@@ -51,7 +51,7 @@ Patch16: evolution-data-server-1.7.92-fix-fd-leak.patch
 Patch17: evolution-data-server-1.7.92-chain-finalize.patch
 
 # RH bug #198935 / Gnome.org bug #348888
-Patch18: evolution-data-server-1.8.0-msgport-pipes.patch
+Patch18: evolution-data-server-1.8.0-emsgport.patch
 
 ### Dependencies ###
 
@@ -137,7 +137,7 @@ evolution-data-server.
 %patch15 -p1 -b .maybe-fix-crash
 %patch16 -p1 -b .fix-fd-leak
 %patch17 -p1 -b .chain-finalize
-%patch18 -p1 -b .msgport-pipes
+%patch18 -p1 -b .emsgport
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -340,6 +340,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libexchange-storage-%{eds_api_version}.pc
 
 %changelog
+* Fri Sep 15 2006 Matthew Barnes <mbarnes@redhat.com> - 1.8.0-3.fc6
+- Revise patch for RH bug #198935 to eliminate a race condition.
+
 * Tue Sep 12 2006 Matthew Barnes <mbarnes@redhat.com> - 1.8.0-2.fc6
 - Add patch for RH bug #198935.