diff --git a/.gitignore b/.gitignore
index e479919..4c672cb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ evolution-2.31.5.tar.bz2
 /evolution-2.91.91.tar.bz2
 /evolution-2.91.92.tar.bz2
 /evolution-3.0.0.tar.bz2
+/evolution-3.1.1.tar.bz2
diff --git a/evolution.spec b/evolution.spec
index 843e947..6a250a0 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -4,14 +4,14 @@
 %define gnome_doc_utils_version 0.8.0
 %define gnome_icon_theme_version 2.30.2.1
 %define gtk3_version 3.0.0
-%define gtkhtml_version 3.91.90
+%define gtkhtml_version 4.1.1
 %define intltool_version 0.35.5
 %define libgdata_version 0.7.0
 %define libgweather_version 2.91.0
 %define clutter_gtk_version 0.10
 %define soup_version 2.4.0
 
-%define evo_base_version 3.0
+%define evo_base_version 3.1
 
 %define last_anjal_version 0.3.2-3
 %define last_libgal2_version 2:2.5.3-2
@@ -27,14 +27,14 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.0.0
+Version: 3.1.1
 Release: 1%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
 URL: http://projects.gnome.org/evolution/
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-Source: http://download.gnome.org/sources/%{name}/3.0/%{name}-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/%{name}/3.1/%{name}-%{version}.tar.bz2
 
 Obsoletes: anjal <= %{last_anjal_version}
 Obsoletes: libgal2 <= %{last_libgal2_version}
@@ -514,10 +514,6 @@ rm -rf $RPM_BUILD_ROOT
 %{evo_plugin_dir}/org-gnome-face.eplug
 %{evo_plugin_dir}/liborg-gnome-face.so
 
-%{evo_plugin_dir}/org-gnome-groupwise-features.eplug
-%{evo_plugin_dir}/liborg-gnome-groupwise-features.so
-%{evo_plugin_dir}/org-gnome-compose-send-options.xml
-
 #%{evo_plugin_dir}/org-gnome-image-inline.eplug
 #%{evo_plugin_dir}/liborg-gnome-image-inline.so
 
@@ -625,6 +621,10 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Mon May 09 2011 Milan Crha <mcrha@redhat.com> - 3.1.1-1
+- Update to 3.1.1
+- Drop groupwise plugin, as it was split out upstream
+
 * Mon Apr 04 2011 Milan Crha <mcrha@redhat.com> - 3.0.0-1
 - Update to 3.0.0
 
diff --git a/sources b/sources
index 4e6e5e1..18a755b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1ba663469e9d9bd6ed93b4b5960c939f  evolution-3.0.0.tar.bz2
+598ca06653b525a9737bcf3cc2b34e0c  evolution-3.1.1.tar.bz2