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/gtkmm2.changes b/gtkmm2.changes
index fb10925..71248a9 100644
--- a/gtkmm2.changes
+++ b/gtkmm2.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+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
 
diff --git a/gtkmm2.spec b/gtkmm2.spec
index d82c8d6..d65ddc6 100644
--- a/gtkmm2.spec
+++ b/gtkmm2.spec
@@ -24,6 +24,7 @@ BuildRequires:  atkmm-devel cairomm-devel fdupes gcc-c++ glibmm2-devel libsigc++
 BuildRequires:  gtk2-devel >= 2.15.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}