diff --git a/.cvsignore b/.cvsignore
index 8bf0530..1521337 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-evolution-2.9.92.tar.bz2
+evolution-2.10.0.tar.bz2
diff --git a/evolution-2.10.0-e-passwords.patch b/evolution-2.10.0-e-passwords.patch
new file mode 100644
index 0000000..8489dee
--- /dev/null
+++ b/evolution-2.10.0-e-passwords.patch
@@ -0,0 +1,31 @@
+--- evolution-2.10.0/mail/mail-session.c.e-passwords	2007-03-12 23:41:06.000000000 -0400
++++ evolution-2.10.0/mail/mail-session.c	2007-03-12 23:41:35.000000000 -0400
+@@ -679,8 +679,6 @@
+ 		
+ 		d(printf ("Gone non-interactive, checking for outstanding interactive tasks\n"));
+ 
+-		e_passwords_cancel();
+-		
+ 		/* flush/cancel pending user messages */
+ 		while ((um = (struct _user_message_msg *) e_dlist_remhead (&message_list))) {
+ 			d(printf ("Flusing message request: %s\n", um->prompt));
+--- evolution-2.10.0/shell/main.c.e-passwords	2007-03-12 23:39:38.000000000 -0400
++++ evolution-2.10.0/shell/main.c	2007-03-12 23:39:54.000000000 -0400
+@@ -565,7 +565,6 @@
+ 	glade_init ();
+ 	e_cursors_init ();
+ 	e_icon_factory_init ();
+-	e_passwords_init();
+ 
+ 	gtk_window_set_default_icon_name ("evolution");
+ 
+--- evolution-2.10.0/calendar/gui/alarm-notify/notify-main.c.e-passwords	2007-03-12 23:40:22.000000000 -0400
++++ evolution-2.10.0/calendar/gui/alarm-notify/notify-main.c	2007-03-12 23:40:36.000000000 -0400
+@@ -169,7 +169,6 @@
+ 
+ 	alarm_done ();
+ 
+-	e_passwords_shutdown ();
+ 	gnome_sound_shutdown ();
+ 
+ 	return 0;
diff --git a/evolution.spec b/evolution.spec
index eb28145..1b84190 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -46,7 +46,7 @@
 ### Abstract ###
 
 Name: evolution
-Version: 2.9.92
+Version: 2.10.0
 Release: 1%{?dist}
 License: GPL
 Group: Applications/Productivity
@@ -143,6 +143,9 @@ Patch41: evolution-2.9.3-gtk-color-button.patch
 # GNOME bug #218898
 Patch42: evolution-2.9.4-view-message-source.patch
 
+# GNOME bug #376991
+Patch43: evolution-2.10.0-e-passwords.patch
+
 ## Dependencies ###
 
 Requires(post): GConf2
@@ -289,6 +292,7 @@ Development files needed for building things which link against evolution.
 %patch40 -p1 -b .meeting-list-view
 %patch41 -p1 -b .gtk-color-button
 %patch42 -p1 -b .view-message-source
+%patch43 -p1 -b .e-passwords
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -698,6 +702,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Mon Mar 12 2007 Matthew Barnes <mbarnes@redhat.com> - 2.10.0-1.fc7
+- Update to 2.10.0.
+- Add patch for GNOME bug #376991 (refactor password handling).
+
 * Mon Feb 26 2007 Matthew Barnes <mbarnes@redhat.com> - 2.9.92-1.fc7
 - Update to 2.9.92.
 - Require gtkhtml3 >= 3.13.92.
diff --git a/sources b/sources
index 59f77a3..502ccbe 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9f7af45a4f37d05a151d4573133bfd55  evolution-2.9.92.tar.bz2
+68d32e518f235bea9d768ae55e91bffc  evolution-2.10.0.tar.bz2