diff --git a/.cvsignore b/.cvsignore
index 7847821..3c99b17 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-evolution-data-server-2.21.91.tar.bz2
+evolution-data-server-2.21.92.tar.bz2
diff --git a/evolution-data-server-2.21.92-implicit-function-declarations.patch b/evolution-data-server-2.21.92-implicit-function-declarations.patch
new file mode 100644
index 0000000..d60d58e
--- /dev/null
+++ b/evolution-data-server-2.21.92-implicit-function-declarations.patch
@@ -0,0 +1,33 @@
+diff -up evolution-data-server-2.21.92/calendar/libical/examples/access_properties_and_parameters.c.implicit-function-declarations evolution-data-server-2.21.92/calendar/libical/examples/access_properties_and_parameters.c
+--- evolution-data-server-2.21.92/calendar/libical/examples/access_properties_and_parameters.c.implicit-function-declarations	2008-02-25 13:19:45.000000000 -0500
++++ evolution-data-server-2.21.92/calendar/libical/examples/access_properties_and_parameters.c	2008-02-25 13:19:53.000000000 -0500
+@@ -1,6 +1,7 @@
+ /* access_properties_and_parameters.c */
+ 
+ #include <libical/ical.h>
++#include <stdlib.h>
+ #include <string.h>
+ 
+ /* Get a particular parameter out of a component. This routine will
+diff -up evolution-data-server-2.21.92/calendar/libical/src/test/regression-classify.c.implicit-function-declarations evolution-data-server-2.21.92/calendar/libical/src/test/regression-classify.c
+--- evolution-data-server-2.21.92/calendar/libical/src/test/regression-classify.c.implicit-function-declarations	2008-02-22 04:50:11.000000000 -0500
++++ evolution-data-server-2.21.92/calendar/libical/src/test/regression-classify.c	2008-02-25 12:49:18.000000000 -0500
+@@ -31,6 +31,7 @@
+ 
+ #include <stdio.h> /* for printf */
+ #include <errno.h>
++#include <stdlib.h> /* for free */
+ #include <string.h> /* For strerror */
+ 
+ #include <libical/ical.h>
+diff -up evolution-data-server-2.21.92/calendar/libical/src/test/regression-component.c.implicit-function-declarations evolution-data-server-2.21.92/calendar/libical/src/test/regression-component.c
+--- evolution-data-server-2.21.92/calendar/libical/src/test/regression-component.c.implicit-function-declarations	2008-02-22 04:50:11.000000000 -0500
++++ evolution-data-server-2.21.92/calendar/libical/src/test/regression-component.c	2008-02-25 12:49:18.000000000 -0500
+@@ -1,6 +1,7 @@
+ #include <libical/ical.h>
+ #include "regression.h"
+ 
++#include <stdlib.h>
+ #include <string.h>
+ extern int VERBOSE;
+ 
diff --git a/evolution-data-server.spec b/evolution-data-server.spec
index c3c9b7d..5cb6d66 100644
--- a/evolution-data-server.spec
+++ b/evolution-data-server.spec
@@ -26,8 +26,8 @@
 ### Abstract ###
 
 Name: evolution-data-server
-Version: 2.21.91
-Release: 3%{?dist}
+Version: 2.21.92
+Release: 1%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
@@ -52,11 +52,8 @@ Patch13: evolution-data-server-1.10.1-camel-folder-summary-crash.patch
 # RH bug #243296
 Patch14: evolution-data-server-1.11.5-fix-64bit-acinclude.patch
 
-# GNOME bug #516074
-Patch15: evolution-data-server-2.21.91-netdb-breakage.patch
-
-# G_GNUC_PRETTY_FUNCTION is deprecated
-Patch16: evolution-data-server-2.21.91-no-gnuc-pretty-function.patch
+# Can't have an unstable release without one...
+Patch15: evolution-data-server-2.21.92-implicit-function-declarations.patch
 
 ### Build Dependencies ###
 
@@ -135,8 +132,7 @@ This package contains developer documentation for %{name}.
 %patch12 -p1 -b .fix-ldap-query
 %patch13 -p1 -b .camel-folder-summary-crash
 %patch14 -p1 -b .fix-64bit-acinclude
-%patch15 -p1 -b .netdb-breakage
-%patch16 -p1 -b .no-gnuc-pretty-function
+%patch15 -p1 -b .implicit-function-declarations
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -379,6 +375,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/libedataserverui
 
 %changelog
+* Mon Feb 25 2008 Matthew Barnes <mbarnes@redhat.com> - 2.21.92-1.fc9
+- Update to 2.21.92
+- Remove patch for GNOME bug #516074 (fixed upstream).
+
 * Thu Feb 14 2008 Matthew Barnes <mbarnes@redhat.com> - 2.21.91-3.fc9
 - Try removing the ancient "ldap-x86_64-hack" patch.
 
diff --git a/sources b/sources
index 85dd922..ce09593 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-abf3fde5f18c261c111b0382f9e2e424  evolution-data-server-2.21.91.tar.bz2
+b2a02de49f0f48d3664a107d53140ebb  evolution-data-server-2.21.92.tar.bz2