diff --git a/.cvsignore b/.cvsignore
index 5ec8a76..59873f2 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-evolution-2.2.1.1.tar.bz2
+evolution-2.2.2.tar.bz2
diff --git a/evolution.spec b/evolution.spec
index 9e20f81..39331ed 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -1,10 +1,10 @@
 # no ppc64 mozilla
 ExcludeArch: ppc64
 
-%define gal_version 2:2.4.1
-%define gtkhtml_version 3.6.1
+%define gal_version 2:2.4.2
+%define gtkhtml_version 3.6.2
 %define soup_version 2.2.2
-%define eds_version 1.2.1
+%define eds_version 1.2.2
 %define use_mozilla_nss 1
 %define evo_major 2.2
 %define libbonoboui_version 2.4.2
@@ -35,8 +35,8 @@ ExcludeArch: ppc64
 %define nntp_support 1
 
 Name: evolution
-Version: 2.2.1.1
-Release: 2
+Version: 2.2.2
+Release: 1
 License: GPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://www.ximian.com/
@@ -56,15 +56,8 @@ Patch98: evolution-1.4.4-ldap-x86_64-hack.patch
 Patch100: evo-addressbook-print-with-pango-2.patch
 Patch101: evo-calendar-print-with-pango-4.patch
 
-# patch from upstream:
-Patch102: evolution-2.2.0-XB73192.patch
-
-
-Patch103: evolution-2.2.0-fix-for-dbus31.patch
 Patch104: evolution-2.2.0-port-to-pilot-link-0.12.patch
 
-Patch105: evolution-2.2.1.1-XB73844.patch
-
 # not accepted, but proposed on a few occasions.  fixes problems with
 # some cyrus servers
 #Patch200: evolution-1.4.5-imap-command-length.patch
@@ -178,19 +171,10 @@ Development files needed for building things which link against evolution.
 
 # patches sent upstream
 %patch100 -p0 -b .addressbook-print-with-pango
-%patch101 -p0 -b .calendar-print-with-pango
-
-# patch from upstream:
-cd mail
-%patch102 -p0 -b .XB-73912
-cd ..
-
-%patch103 -p1 -b .fix-for-dbus31
+%patch101 -p1 -b .calendar-print-with-pango
 
 %patch104 -p1 -b .port-to-pilot-link-0.12
 
-%patch105 -p0 -b .XB-73844
-
 #patch200 -p1 -b .commandlength
 
 #patch500 -p0 -b .wombatsm
@@ -349,6 +333,17 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/evolution/%{evo_major}/*/*.a
 
 %changelog
+* Mon Apr 11 2005 David Malcolm <dmalcolm@redhat.com> - 2.2.2-1
+- 2.2.2
+- updated evo-calendar-print-with-pango-4.patch to handle upstream change to print_comp_item
+- removed patch for XB73912; now in upstream tarball
+- removed patch to new-mail-notify; generalised fix to cope with various DBus API versions is now upstream
+- removed patch for XB73844; now in upstream tarball
+- Update requirements:
+  - gtkhtml3 from 3.6.1 to 3.6.2
+  - libgal2 from 2.4.1 to 2.4.2
+  - eds from 1.2.1 to 1.2.2
+
 * Wed Mar 23 2005 David Malcolm <dmalcolm@redhat.com> - 2.2.1.1-2
 - Add patch for upstream bug XB73844 (should now be able to accept meeting requests)
 
diff --git a/sources b/sources
index c5eea42..96a1d52 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0d41c89ace6485da3ef9c76ece68ae9c  evolution-2.2.1.1.tar.bz2
+9b49942c8bdd1dc21f2d28792b12f400  evolution-2.2.2.tar.bz2