diff --git a/baselibs.conf b/baselibs.conf
index 85b7563..513ace7 100644
--- a/baselibs.conf
+++ b/baselibs.conf
@@ -1,2 +1,3 @@
-gtkmm2
 libgtkmm-2_4-1
+  provides "gtkmm2-<targettype> = <version>"
+  obsoletes "gtkmm2-<targettype> <= <version>"
diff --git a/gtkmm-2.21.8.1.tar.bz2 b/gtkmm-2.21.8.1.tar.bz2
deleted file mode 100644
index 57f33b4..0000000
--- a/gtkmm-2.21.8.1.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0a27fba30c1c724cb72fa211369a24081cee7fac9c236f5bf377a47ef8f442d3
-size 11421572
diff --git a/gtkmm-2.22.0.tar.bz2 b/gtkmm-2.22.0.tar.bz2
new file mode 100644
index 0000000..0735e29
--- /dev/null
+++ b/gtkmm-2.22.0.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8478d80d8d4793c2e1c459a71bad6a767a43eaf2664da06a9bd65a2b98bb07b1
+size 11496369
diff --git a/gtkmm2.changes b/gtkmm2.changes
index 9c7267f..71248a9 100644
--- a/gtkmm2.changes
+++ b/gtkmm2.changes
@@ -1,3 +1,32 @@
+-------------------------------------------------------------------
+Mon Oct 11 18:08:46 CEST 2010 - vuntz@opensuse.org
+
+- Update baselibs.conf to use libgtkmm-2_4-1 instead of gtkmm2.
+- Add a Provides for gtkmm2 to libgtkmm-2_4-1 in baselibs.conf,
+  like in the .spec file.
+
+-------------------------------------------------------------------
+Tue Sep 28 19:22:27 CEST 2010 - vuntz@opensuse.org
+
+- Update to version 2.22.0:
+  + Windows-only changes.
+
+-------------------------------------------------------------------
+Sun Sep 26 14:22:21 CEST 2010 - vuntz@opensuse.org
+
+- Update to version 2.21.9:
+  + Gdk:
+    - Visual: Added  get_visual_type(), get_depth(),
+      get_byte_order(), get_colormap_size(), get_bits_per_rgb(),
+      get_red_pixel_details(), get_green_pixel_details(),
+      get_blue_pixel_details().
+    - Added many properties.
+  + Gtk:
+    - MenuBar: Added set/get_pack_direction() and
+      set/get_child_pack_direction
+    - SeparatorToolItem: Added get/set_draw().
+    - Added many properties.
+
 -------------------------------------------------------------------
 Wed Sep 22 07:38:39 UTC 2010 - coolo@novell.com
 
diff --git a/gtkmm2.spec b/gtkmm2.spec
index afd61bc..d65ddc6 100644
--- a/gtkmm2.spec
+++ b/gtkmm2.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package gtkmm2 (Version 2.21.8.1)
+# spec file for package gtkmm2 (Version 2.22.0)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -22,8 +22,9 @@ Name:           gtkmm2
 %define _name gtkmm
 BuildRequires:  atkmm-devel cairomm-devel fdupes gcc-c++ glibmm2-devel libsigc++2-devel pangomm-devel
 BuildRequires:  gtk2-devel >= 2.15.1
-Version:        2.21.8.1
+Version:        2.22.0
 Release:        1
+# NOTE: on upgrade to a new upstream version, change the Obsoletes from <= to < (here and in baselibs.conf)
 Group:          System/Libraries
 License:        LGPLv2.1+
 Summary:        C++ Interface for GTK2 (a GUI Library for X)
@@ -42,7 +43,8 @@ License:        LGPLv2.1+
 Group:          System/Libraries
 Summary:        C++ Interface for GTK2 (a GUI library for X)
 Provides:       gtkmm2 = %{version}
-Obsoletes:      gtkmm2 < %{version}
+# Note: we keep <= (and a rpmlint warning...) until we get a version higher than 2.22.0 (when this provides/obsoletes was introduced)
+Obsoletes:      gtkmm2 <= %{version}
 Provides:       gtkmm24 = %{version}
 Obsoletes:      gtkmm24 < %{version}