diff --git a/.gitignore b/.gitignore
index 3c96706..bc9be83 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ evolution-2.31.5.tar.bz2
 /evolution-2.91.3.tar.bz2
 /evolution-2.91.4.tar.bz2
 /evolution-2.91.5.tar.bz2
+/evolution-2.91.6.tar.bz2
diff --git a/evo-2.91.5-finish-tasks-before-camel-shutdown.patch b/evo-2.91.5-finish-tasks-before-camel-shutdown.patch
deleted file mode 100644
index 28c7588..0000000
--- a/evo-2.91.5-finish-tasks-before-camel-shutdown.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff --git a/mail/e-mail-backend.c b/mail/e-mail-backend.c
-index 740cf85..3ab7cbd 100644
---- a/mail/e-mail-backend.c
-+++ b/mail/e-mail-backend.c
-@@ -226,7 +226,6 @@ mail_backend_poll_to_quit (EActivity *activity)
- static void
- mail_backend_ready_to_quit (EActivity *activity)
- {
--	camel_shutdown ();
- 	emu_free_mail_cache ();
- 
- 	/* Do this last.  It may terminate the process. */
-@@ -429,6 +428,15 @@ mail_backend_dispose (GObject *object)
- }
- 
- static void
-+mail_backend_finalize (GObject *object)
-+{
-+	if (G_OBJECT_CLASS (e_mail_backend_parent_class)->finalize)
-+		G_OBJECT_CLASS (e_mail_backend_parent_class)->finalize (object);
-+
-+	camel_shutdown ();
-+}
-+
-+static void
- mail_backend_constructed (GObject *object)
- {
- 	EMailBackendPrivate *priv;
-@@ -515,6 +523,7 @@ e_mail_backend_class_init (EMailBackendClass *class)
- 	object_class = G_OBJECT_CLASS (class);
- 	object_class->get_property = mail_backend_get_property;
- 	object_class->dispose = mail_backend_dispose;
-+	object_class->finalize = mail_backend_finalize;
- 	object_class->constructed = mail_backend_constructed;
- 
- 	shell_backend_class = E_SHELL_BACKEND_CLASS (class);
-diff --git a/shell/e-shell.c b/shell/e-shell.c
-index b1891ce..123a975 100644
---- a/shell/e-shell.c
-+++ b/shell/e-shell.c
-@@ -691,6 +691,7 @@ shell_finalize (GObject *object)
- 	if (!unique_app_is_running (UNIQUE_APP (object)))
- 		e_file_lock_destroy ();
- 
-+	g_list_foreach (priv->loaded_backends, (GFunc) g_object_unref, NULL);
- 	g_list_free (priv->loaded_backends);
- 
- 	g_free (priv->geometry);
diff --git a/evolution.spec b/evolution.spec
index 5d405de..a3c0e6a 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -3,11 +3,11 @@
 %define gnome_desktop_version 2.26.0
 %define gnome_doc_utils_version 0.8.0
 %define gnome_icon_theme_version 2.30.2.1
-%define gtk2_version 2.22.0
-%define gtkhtml_version 3.91.3
+%define gtk3_version 2.99.2
+%define gtkhtml_version 3.91.6
 %define intltool_version 0.35.5
-%define libgdata_version 0.6.3
-%define libgweather_version 2.25.4
+%define libgdata_version 0.7.0
+%define libgweather_version 2.91.0
 %define clutter_gtk_version 0.10
 %define soup_version 2.4.0
 
@@ -28,8 +28,8 @@
 ### Abstract ###
 
 Name: evolution
-Version: 2.91.5
-Release: 4%{?dist}
+Version: 2.91.6
+Release: 1%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -48,9 +48,6 @@ Patch10: evolution-1.4.4-ldap-x86_64-hack.patch
 # RH bug #589555
 Patch13: evolution-2.30.1-help-contents.patch
 
-# RH bug #657254  bgo #638808
-Patch20: evo-2.91.5-finish-tasks-before-camel-shutdown.patch
-
 ## Dependencies ###
 
 Requires(pre): GConf2
@@ -82,7 +79,7 @@ BuildRequires: gnome-desktop-devel >= %{gnome_desktop_version}
 BuildRequires: gnome-doc-utils >= %{gnome_doc_utils_version}
 BuildRequires: gnutls-devel
 BuildRequires: gtk-doc
-BuildRequires: gtk2-devel >= %{gtk2_version}
+BuildRequires: gtk3-devel >= %{gtk3_version}
 BuildRequires: gtkhtml3-devel >= %{gtkhtml_version}
 BuildRequires: gtkimageview-devel
 BuildRequires: intltool >= %{intltool_version}
@@ -140,7 +137,7 @@ Group: Development/Libraries
 Summary: Development files for building against %{name}
 Requires: %{name} = %{version}-%{release}
 Requires: evolution-data-server-devel >= %{version}
-Requires: gtk2-devel >= %{gtk2_version}
+Requires: gtk3-devel >= %{gtk3_version}
 Requires: gtkhtml3-devel >= %{gtkhtml_version}
 Requires: libgdata-devel >= %{libgdata_version}
 Requires: libgweather-devel >= %{libgweather_version}
@@ -203,7 +200,6 @@ This package contains the plugin to import Microsoft Personal Storage Table
 %setup -q -n evolution-%{version}
 %patch10 -p1 -b .ldaphack
 %patch13 -p1 -b .help-contents
-%patch20 -p1 -b .camel-shutdown-later
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -604,6 +600,11 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Mon Jan 31 2011 Milan Crha <mcrha@redhat.com> - 2.91.6-1
+- Update to 2.91.6
+- Require gtk3
+- Remove patch for Red Hat bug #657254 (fixed upstream)
+
 * Fri Jan 21 2011 Dan Williams <dcbw@redhat.com> - 2.91.5-4
 - Fix crash at shutdown by finishing tasks before cleaning up (rh #657254)
 
diff --git a/sources b/sources
index 4319b73..5cd97ed 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5ba706c38a6fa81699ce16e05e5471b8  evolution-2.91.5.tar.bz2
+e8487863aa19cf8bfe386f2070c65f55  evolution-2.91.6.tar.bz2