diff --git a/evolution-1.4.4-ldap-x86_64-hack.patch b/evolution-1.4.4-ldap-x86_64-hack.patch
deleted file mode 100644
index 47cafbd..0000000
--- a/evolution-1.4.4-ldap-x86_64-hack.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- evolution-1.4.4/configure.ldaphack	2003-08-05 02:06:26.000000000 -0400
-+++ evolution-1.4.4/configure	2003-08-05 02:06:45.000000000 -0400
-@@ -12135,7 +12135,7 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lldap $LDAP_LDFLAGS $LDAP_LIBS $LIBS"
-+LIBS="-lldap -lresolv $LDAP_LDFLAGS $LDAP_LIBS $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h.  */
diff --git a/evolution-data-server-1.4.4-ldap-x86_64-hack.patch b/evolution-data-server-1.4.4-ldap-x86_64-hack.patch
new file mode 100644
index 0000000..47cafbd
--- /dev/null
+++ b/evolution-data-server-1.4.4-ldap-x86_64-hack.patch
@@ -0,0 +1,11 @@
+--- evolution-1.4.4/configure.ldaphack	2003-08-05 02:06:26.000000000 -0400
++++ evolution-1.4.4/configure	2003-08-05 02:06:45.000000000 -0400
+@@ -12135,7 +12135,7 @@
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lldap $LDAP_LDFLAGS $LDAP_LIBS $LIBS"
++LIBS="-lldap -lresolv $LDAP_LDFLAGS $LDAP_LIBS $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+ /* confdefs.h.  */
diff --git a/evolution-data-server.spec b/evolution-data-server.spec
index 341923d..c889122 100644
--- a/evolution-data-server.spec
+++ b/evolution-data-server.spec
@@ -27,7 +27,7 @@
 
 Name: evolution-data-server
 Version: 2.21.5
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
@@ -37,7 +37,7 @@ Source: %{name}-%{version}.tar.bz2
 
 ### Patches ###
 
-Patch10: evolution-1.4.4-ldap-x86_64-hack.patch
+Patch10: evolution-data-server-1.4.4-ldap-x86_64-hack.patch
 
 # Remove gnome-common macros from configure.in.
 # We do not ship gnome-common (or at least we're not supposed to).
@@ -379,6 +379,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/libedataserverui
 
 %changelog
+* Thu Jan 17 2008 Matthew Barnes <mbarnes@redhat.com> - 2.21.5-3.fc9
+- Rename evolution-1.4.4-ldap-x86_64-hack.patch to avoid namespace
+  collision with similarly named patch in evolution (RH bug #395551).
+
 * Wed Jan 16 2008 Matthew Barnes <mbarnes@redhat.com> - 2.21.5-2.fc9
 - Add patch for GNOME bug #509644 (password dialog breakage).
 - Remove patch for RH bug #384741 (fixed upstream).