diff --git a/.cvsignore b/.cvsignore
index 4475073..0dfac12 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-evolution-data-server-2.21.5.tar.bz2
+evolution-data-server-2.21.90.tar.bz2
diff --git a/evolution-data-server-2.21.5-password-dialog.patch b/evolution-data-server-2.21.5-password-dialog.patch
deleted file mode 100644
index 0d603cd..0000000
--- a/evolution-data-server-2.21.5-password-dialog.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -up evolution-data-server-2.21.5/libedataserverui/e-passwords.c.password-dialog evolution-data-server-2.21.5/libedataserverui/e-passwords.c
---- evolution-data-server-2.21.5/libedataserverui/e-passwords.c.password-dialog	2008-01-16 12:23:51.000000000 -0500
-+++ evolution-data-server-2.21.5/libedataserverui/e-passwords.c	2008-01-16 12:24:18.000000000 -0500
-@@ -873,12 +873,12 @@ ep_ask_password (EPassMsg *msg)
- 
- 	widget = gtk_dialog_new_with_buttons (
- 		msg->title, msg->parent, 0,
--		GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
--		GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
-+		GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-+		GTK_STOCK_OK, GTK_RESPONSE_OK,
- 		NULL);
- 	gtk_dialog_set_has_separator (GTK_DIALOG (widget), FALSE);
- 	gtk_dialog_set_default_response (
--		GTK_DIALOG (widget), GTK_RESPONSE_ACCEPT);
-+		GTK_DIALOG (widget), GTK_RESPONSE_OK);
-         gtk_window_set_resizable (GTK_WINDOW (widget), FALSE);
- 	gtk_container_set_border_width (GTK_CONTAINER (widget), 12);
- 	password_dialog = GTK_DIALOG (widget);
diff --git a/evolution-data-server.spec b/evolution-data-server.spec
index c889122..e4c9020 100644
--- a/evolution-data-server.spec
+++ b/evolution-data-server.spec
@@ -4,12 +4,12 @@
 %define krb5_support 1
 %define nntp_support 1
 
-%define glib2_version 2.14.0
+%define glib2_version 2.15.3
 %define gtk_doc_version 1.9
 %define intltool_version 0.35.5
-%define libbonobo_version 2.4.2
+%define libbonobo_version 2.20.3
 %define orbit2_version 2.9.8
-%define soup_version 2.2.3
+%define soup_version 2.3.0
 
 %define eds_base_version 2.22
 %define eds_api_version 1.2
@@ -26,8 +26,8 @@
 ### Abstract ###
 
 Name: evolution-data-server
-Version: 2.21.5
-Release: 3%{?dist}
+Version: 2.21.90
+Release: 1%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
@@ -55,9 +55,6 @@ Patch14: evolution-data-server-1.10.1-camel-folder-summary-crash.patch
 # RH bug #243296
 Patch15: evolution-data-server-1.11.5-fix-64bit-acinclude.patch
 
-# GNOME bug #509644
-Patch16: evolution-data-server-2.21.5-password-dialog.patch
-
 ### Build Dependencies ###
 
 BuildRequires: GConf2-devel
@@ -136,7 +133,6 @@ This package contains developer documentation for %{name}.
 %patch13 -p1 -b .fix-ldap-query
 %patch14 -p1 -b .camel-folder-summary-crash
 %patch15 -p1 -b .fix-64bit-acinclude
-%patch16 -p1 -b .password-dialog
 
 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 Jan 28 2008 Matthew Barnes <mbarnes@redhat.com> - 2.21.90-1.fc9
+- Update to 2.21.90
+- Remove patch for GNOME bug #509644 (fixed upstream).
+
 * Thu Jan 17 2008 Matthew Barnes <mbarnes@redhat.com> - 2.21.5-3.fc9
 - Rename evolution-1.4.4-ldap-x86_64-hack.patch to avoid namespace
   collision with similarly named patch in evolution (RH bug #395551).
diff --git a/sources b/sources
index 02b2ce6..899c68b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4887db35e5658c30e4a8653eff19a1e7  evolution-data-server-2.21.5.tar.bz2
+7ad8abae672ccfd785888d191dce058b  evolution-data-server-2.21.90.tar.bz2