diff --git a/evolution-data-server.spec b/evolution-data-server.spec
index a924ef0..e5cd665 100644
--- a/evolution-data-server.spec
+++ b/evolution-data-server.spec
@@ -25,7 +25,7 @@
 Summary: Backend data server for evolution
 Name: evolution-data-server
 Version: 1.5.4
-Release: 3
+Release: 4
 License: LGPL
 Group: System Environment/Libraries
 Source0: ftp://ftp.gnome.org/pub/gnome/sources/evolution-data-server/1.0/%{name}-%{version}.tar.bz2
@@ -122,7 +122,7 @@ evolution-data-server.
 %patch103 -p1 -b .validatehelo
 %patch200 -p0 -b .fix-uid-leak
 %patch201 -p0 -b .fix-comp-ref-leak
-%patch300 -p1 -b .make-imap4-optional
+%patch300 -p1 -b .make_imap4_optional
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -290,6 +290,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Jan  9 2006 David Malcolm <dmalcolm@cassandra.boston.redhat.com> - 1.5.4-4
+- updated patch 300 to remove usage of GNOME_COMPILE_WARNINGS from configure.in
+  (since gnome-common might not be available when we rerun the autotools)
+
 * Mon Jan  9 2006 David Malcolm <dmalcolm@redhat.com> - 1.5.4-3
 - added patch to make the "imap4"/"IMAP4rev1" backend optional; disable it in 
   our packages; re-run automake since we have touched various Makefile.am