diff --git a/evolution.spec b/evolution.spec
index bfcf736..9d57f39 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -29,7 +29,7 @@ ExcludeArch: ppc64
 
 Name: evolution
 Version: 2.3.8
-Release: 1
+Release: 2
 License: GPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://www.ximian.com/
@@ -251,7 +251,7 @@ fi
 %endif
 
 CPPFLAGS="-I%{_includedir}/et"; export CPPFLAGS
-CFLAGS="$RPM_OPT_FLAGS -fPIC -I%{_includedir}/et -Werror-implicit-function-declaration"; export CFLAGS
+CFLAGS="$RPM_OPT_FLAGS -fPIC -I%{_includedir}/et"; export CFLAGS
 %if ! %{use_mozilla_nss}
 if pkg-config openssl ; then
 	CFLAGS="$CFLAGS `pkg-config --cflags openssl`"
@@ -272,7 +272,7 @@ autoreconf -i
   %ldap_flags %pilot_flags %krb5_flags %nntp_flags %ssl_flags \
   --enable-plugins=all
 export tagname=CC
-make LIBTOOL=%{_bindir}/libtool
+make LIBTOOL=%{_bindir}/libtool CFLAGS="$CFLAGS -Werror-implicit-function-declaration"
 
 #cat /dev/null > default_user/local/Inbox/mbox
 
@@ -361,6 +361,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/evolution/%{evo_major}/*.so
 
 %changelog
+* Fri Aug 26 2005 David Malcolm <dmalcolm@redhat.com> - 2.3.8-2
+- Move -Werror-implicit-function-declaration from configuration to the make
+  stage, to avoid breaking configuration tests.
+
 * Tue Aug 23 2005 David Malcolm <dmalcolm@redhat.com> - 2.3.8-1
 - 2.3.8
 - add -Werror-implicit-function-declaration to CFLAGS and a patch to fix the