diff --git a/.cvsignore b/.cvsignore
index 6b8e538..ea997ab 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-evolution-data-server-2.22.1.tar.bz2
+evolution-data-server-2.23.1.tar.bz2
diff --git a/evolution-data-server-2.22.0-implicit-function-declaration.patch b/evolution-data-server-2.22.0-implicit-function-declaration.patch
deleted file mode 100644
index ff245e8..0000000
--- a/evolution-data-server-2.22.0-implicit-function-declaration.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -up evolution-data-server-2.22.0/calendar/libical/examples/access_properties_and_parameters.c.implicit-function-declaration evolution-data-server-2.22.0/calendar/libical/examples/access_properties_and_parameters.c
---- evolution-data-server-2.22.0/calendar/libical/examples/access_properties_and_parameters.c.implicit-function-declaration	2008-03-10 12:39:02.000000000 -0400
-+++ evolution-data-server-2.22.0/calendar/libical/examples/access_properties_and_parameters.c	2008-03-10 12:39:18.000000000 -0400
-@@ -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.22.0/calendar/libical/src/test/regression-classify.c.implicit-function-declaration evolution-data-server-2.22.0/calendar/libical/src/test/regression-classify.c
---- evolution-data-server-2.22.0/calendar/libical/src/test/regression-classify.c.implicit-function-declaration	2008-02-22 04:50:11.000000000 -0500
-+++ evolution-data-server-2.22.0/calendar/libical/src/test/regression-classify.c	2008-03-10 12:28:44.000000000 -0400
-@@ -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 --git a/evolution-data-server.spec b/evolution-data-server.spec
index 44e6c61..449e6f1 100644
--- a/evolution-data-server.spec
+++ b/evolution-data-server.spec
@@ -4,7 +4,7 @@
 %define krb5_support 1
 %define nntp_support 1
 
-%define glib2_version 2.15.3
+%define glib2_version 2.16.1
 %define gtk2_version 2.10.0
 %define gtk_doc_version 1.9
 %define intltool_version 0.35.5
@@ -12,7 +12,7 @@
 %define orbit2_version 2.9.8
 %define soup_version 2.3.0
 
-%define eds_base_version 2.22
+%define eds_base_version 2.24
 %define eds_api_version 1.2
 
 %define use_gnome_keyring 1
@@ -27,7 +27,7 @@
 ### Abstract ###
 
 Name: evolution-data-server
-Version: 2.22.1
+Version: 2.23.1
 Release: 1%{?dist}
 License: LGPL
 Group: System Environment/Libraries
@@ -53,8 +53,6 @@ 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
 
-Patch15: evolution-data-server-2.22.0-implicit-function-declaration.patch
-
 ### Build Dependencies ###
 
 BuildRequires: GConf2-devel
@@ -64,7 +62,6 @@ BuildRequires: db4-devel
 BuildRequires: flex
 BuildRequires: gettext
 BuildRequires: glib2-devel >= %{glib2_version}
-BuildRequires: gnome-vfs2-devel
 BuildRequires: gnutls-devel
 BuildRequires: gtk-doc >= %{gtk_doc_version}
 BuildRequires: gtk2-devel >= %{gtk2_version}
@@ -133,7 +130,6 @@ 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 .implicit-function-declaration
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -376,7 +372,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/libedataserverui
 
 %changelog
-* Mon Apr 07 2008 Matthew Barnes <mbarnes@redhat.com. - 2.22.1-1.fc9
+* Mon Apr 21 2008 Matthew Barnes <mbarnes@redhat.com> - 2.23.1-1.fc10
+- Update to 2.23.1
+- Bump eds_base_version to 2.24.
+- Bump glib2 requirement to 2.16.1.
+- Drop gnome-vfs2 requirement.
+
+* Mon Apr 07 2008 Matthew Barnes <mbarnes@redhat.com> - 2.22.1-1.fc9
 - Update to 2.22.1
 - Remove patch for RH bug #296671 (fixed upstream).
 - Remove patch for GNOME bug #523023 (fixed upstream).
diff --git a/sources b/sources
index cb85b20..99c839d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1972fa3dbd46c25216b00c1d35f83eaf  evolution-data-server-2.22.1.tar.bz2
+6583f5e5de49356f0ccf5a0f3aca1684  evolution-data-server-2.23.1.tar.bz2