diff --git a/evolution.spec b/evolution.spec
index 342477b..19f606e 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -37,7 +37,7 @@
 # Upstream tarballs often contain instances of undeclared functions; these tend
 # to work on i386 but fail on 64-bit architectures.  Leave this on to trap the
 # warnings as errors (and ideally get the flag into the upstream build):
-%define require_function_declarations 0
+%define require_function_declarations 1
 
 %define evo_plugin_dir %{_libdir}/evolution/%{evo_major}/plugins
 
@@ -45,7 +45,7 @@
 
 Name: evolution
 Version: 2.7.91
-Release: 2
+Release: 3
 License: GPL
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -85,9 +85,9 @@ Patch16: evolution-2.5.4-fix-conduit-dir.patch
 Patch17: evolution-2.7.1-no-gnome-common.patch
 
 # XXX Make sure these are still needed and push them upstream.
-Patch18: evolution-2.4.1-fix-missing-declarations.patch
-Patch19: evolution-2.5.4-fix-missing-declarations.patch
-Patch20: evolution-2.5.5.1-fix-missing-declarations-2.5.5.1.patch
+#Patch18: evolution-2.4.1-fix-missing-declarations.patch
+#Patch19: evolution-2.5.4-fix-missing-declarations.patch
+#Patch20: evolution-2.5.5.1-fix-missing-declarations-2.5.5.1.patch
 
 Patch21: evolution-2.7.1-notification-cleanups.patch
 Patch22: evolution-2.6.0-prototypes.patch
@@ -116,6 +116,11 @@ Patch29: evolution-2.7.4-deleting-preedit-buffer.patch
 # RH bug #197868 / Gnome.org bug #350823
 Patch30: evolution-2.7.91-default-mailer.patch
 
+Patch31: evolution-2.7.91-fix-missing-declarations.patch
+
+# RH bug #202383
+Patch32: evolution-2.7.91-fix-duplicate-alarm.patch
+
 ### Dependencies ###
 
 Requires: ORBit2 >= %{orbit2_version}
@@ -236,9 +241,9 @@ Development files needed for building things which link against evolution.
 #patch15 -p1 -b .fix-conduits  # leave commented
 %patch16 -p1 -b .fix-conduit-dir
 %patch17 -p1 -b .no-gnome-common
-%patch18 -p1 -b .fix-missing-declarations
-%patch19 -p1 -b .fix-missing-declarations-2-5-4
-%patch20 -p1 -b .fix-missing-declarations-2.5.5.1
+#patch18 -p1 -b .fix-missing-declarations
+#patch19 -p1 -b .fix-missing-declarations-2-5-4
+#patch20 -p1 -b .fix-missing-declarations-2.5.5.1
 %patch21 -p1 -b .notification-cleanups
 %patch22 -p1 -b .prototypes
 %patch23 -p1 -b .quit-resize-crash
@@ -249,6 +254,8 @@ Development files needed for building things which link against evolution.
 %patch28 -p1 -b .submit-bug-report
 %patch29 -p1 -b .deleting-preedit-buffer
 %patch30 -p1 -b .default-mailer
+%patch31 -p1 -b .fix-missing-declarations
+%patch32 -p1 -b .fix-duplicate-alarm
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -639,6 +646,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Mon Aug 14 2006 Matthew Barnes <mbarnes@redhat.com> - 2.7.91-3
+- Consolidate "missing declarations" patches.
+- Add patch for RH bug #202383.
+
 * Fri Aug 11 2006 Matthew Barnes <mbarnes@redhat.com> - 2.7.91-2
 - Add patch for RH bug #197868.