diff --git a/evolution-data-server.spec b/evolution-data-server.spec
index 2e7f54d..7a98a1f 100644
--- a/evolution-data-server.spec
+++ b/evolution-data-server.spec
@@ -18,11 +18,14 @@
 %define camel_provider_dir %{_libdir}/evolution-data-server-%{eds_api_version}/camel-providers
 %define eds_extensions_dir %{_libdir}/evolution-data-server-%{eds_api_version}/extensions
 
+# Use stricter build settings than required by upstream.
+%define strict_build_settings 1
+
 ### Abstract ###
 
 Name: evolution-data-server
 Version: 1.8.0
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
@@ -60,6 +63,9 @@ Patch19: evolution-data-server-1.8.0-fix-ecal-crash.patch
 # Gnome.org bug #356828
 Patch20: evolution-data-server-1.8.0-uninstall.patch
 
+# Gnome.org bug #357666
+Patch21: evolution-data-server-1.8.0-deprecated-glib.patch
+
 ### Dependencies ###
 
 Requires: GConf2
@@ -149,6 +155,7 @@ cp %{SOURCE2} calendar/libical/zoneinfo/Asia
 %patch18 -p1 -b .emsgport
 %patch19 -p1 -b .fix-ecal-crash
 %patch20 -p1 -b .uninstall
+%patch21 -p1 -b .deprecated-glib
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -213,6 +220,21 @@ fi
 %define gtkdoc_flags --enable-gtk-doc=no
 %endif
 
+# Add stricter build settings here as the source code gets cleaned up.
+# We want to make sure things like compiler warnings and avoiding deprecated
+# functions in the GNOME/GTK+ libraries stay fixed.
+#
+# Please file a bug report at bugzilla.gnome.org if these settings break
+# compilation, and encourage the upstream developers to use them.
+
+%if %{strict_build_settings}
+CFLAGS="$CFLAGS \
+	-DG_DISABLE_DEPRECATED=1 \
+	-DGDK_PIXBUF_DISABLE_DEPRECATED=1 \
+	-DGDK_DISABLE_DEPRECATED=1 \
+	-Werror-implicit-function-declaration"
+%endif
+
 # Rerun automake since we patched some Makefile.am files:
 aclocal
 autoheader
@@ -232,7 +254,7 @@ autoconf
 	--enable-file-locking=fcntl --enable-dot-locking=no \
 	%ldap_flags %krb5_flags %nntp_flags %ssl_flags %imap4_flags
 export tagname=CC
-make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool CFLAGS="$CFLAGS -Werror-implicit-function-declaration"
+make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -351,6 +373,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libexchange-storage-%{eds_api_version}.pc
 
 %changelog
+* Mon Sep 25 2006 Matthew Barnes <mbarnes@redhat.com> - 1.8.0-10.fc6
+- Add patch for Gnome.org bug #357666.
+
 * Thu Sep 21 2006 Matthew Barnes <mbarnes@redhat.com> - 1.8.0-9.fc6
 - Revise patch for RH bug #198935 (fix a crash reported in bug #207446).