diff --git a/gnome-color-manager.changes b/gnome-color-manager.changes
index 56b295d..76cf18e 100644
--- a/gnome-color-manager.changes
+++ b/gnome-color-manager.changes
@@ -12,8 +12,6 @@ Mon Mar 21 17:36:16 UTC 2011 - fcrozat@novell.com
   + Add priority for gnome-settings-daemon plugin schema
   + Remove the gtk-doc support
   + Use plugindir from gnome-settings-daemon pkg-config file
-- Remove changes to gcm-prefs .desktop categories, it was breaking
-  new gnome-control-center (and it is no longer needed).
 - Changes from version 2.91.90:
   + Do not ask the user whether to strip the alpha channel during
     calibration.
@@ -149,23 +147,24 @@ Mon Mar 21 17:36:16 UTC 2011 - fcrozat@novell.com
     - Show the correct copyright notice when a profile has used
       markup in the description.
 - Add fix-i2c-include.patch: fix incorrect i2c header include.
-- Add gcc-c++, i2c-tools, pkgconfig(exiv2), pkgconfig(gtk+-3.0),
-  pkgconfig(gnome-settings-daemon), pkgconfig(lcms2),
-  pkgconfig(libcanberra-gtk3), pkgconfig(libexif),
-  pkgconfig(libgnome-control-center), pkgconfig(libusb-1.0),
-  pkgconfig(vte-2.0) to BuildRequires.
-- Remove pkgconfig(dbus-glib-1), pkgconfig(gconf-2.0),
-  pkgconfig(gnome-desktop-2.0), pkgconfig(gtk+-2.0),
-  pkgconfig(lcms), pkgconfig(libcanberra-gtk),
-  pkgconfig(unique-1.0), pkgconfig(vte) and pkgconfig(xxf86vm)
+- Replace pkgconfig() BuildRequires for GNOME 3 port and other
+  updates:
+  + Old: gtk+-2.0, lcms, libcanberra-gtk, vte.
+  + New: gtk+-3.0, lcms2, libcanberra-gtk3, vte-2.0.
+- Remove now unneeded pkgconfig() BuildRequires: dbus-glib-1,
+  gconf-2.0, gnome-desktop-2.0, unique-1.0, xxf86vm.
+- Add gcc-c++, i2c-tools, pkgconfig(exiv2),
+  pkgconfig(gnome-settings-daemon), pkgconfig(libexif),
+  pkgconfig(libgnome-control-center), pkgconfig(libusb-1.0)
   BuildRequires.
-- Replace GConf2 schemas handling with GSettings schemas handling.
-- Create -devel and libcolor-glib1 subpackages
+- Replace GConf2 schemas handling with GSettings schemas handling,
+  with %glib2_gsettings_schema_* macros.
+- Create -devel and libcolor-glib1 subpackages.
 - Remove deprecated configure options --enable-hardware-detection
-  and --disable-schemas-install.
-- Ensure static library isn't built
+  and --disable-schemas-install, and pass --disable-static.
 - Fix category for gcm-prefs.desktop for it to appear in the right
-  GNOME control center category.
+  GNOME control center category: instead of replacing categories,
+  just add some to make our checks happy.
 
 -------------------------------------------------------------------
 Sun Feb 13 14:20:08 CET 2011 - vuntz@opensuse.org
diff --git a/gnome-color-manager.spec b/gnome-color-manager.spec
index 2584755..b1699a3 100644
--- a/gnome-color-manager.spec
+++ b/gnome-color-manager.spec
@@ -27,7 +27,7 @@ License:        GPLv2+
 Group:          System/GUI/GNOME
 Url:            http://projects.gnome.org/gnome-color-manager
 Source:         %{name}-%{version}.tar.bz2
-# PATCH-FIX-UPSTREAM fix-i2c-include.patch fcrozat@novell.com -- fix incorrect i2c header include
+# PATCH-FIX-UPSTREAM fix-i2c-include.patch fcrozat@novell.com -- fix incorrect i2c header include; note that in 3.1/3.2, this won't be needed anymore.
 Patch0:         fix-i2c-include.patch
 BuildRequires:  cups-devel
 BuildRequires:  docbook-utils
@@ -72,8 +72,7 @@ install and generate color profiles in the GNOME desktop.
 %package devel
 License:        GPLv2+
 Group:          Development/Libraries/GNOME
-Summary:        Color management tools for GNOME
-Requires:       %{name} = %{version}
+Summary:        Color management tools for GNOME -- Development Files
 Requires:       libcolor-glib1 = %{version}
 
 %description devel
@@ -83,7 +82,7 @@ install and generate color profiles in the GNOME desktop.
 %package -n libcolor-glib1
 License:        GPLv2+
 Group:          System/Libraries
-Summary:        Color management tools for GNOME
+Summary:        Color management tools for GNOME -- Library
 
 %description -n libcolor-glib1
 GNOME Color Manager is a session framework that makes it easy to manage,
@@ -141,22 +140,22 @@ rm -rf %{buildroot}
 /lib/udev/rules.d/*.rules
 %{_bindir}/gcm-*
 %{_sbindir}/gcm-install-system-wide
+%{_datadir}/GConf/gsettings/org.gnome.color-manager.gschema.migrate
 %{_datadir}/applications/*.desktop
-%{_datadir}/dbus-1/services/org.gnome.ColorManager.service
 %{_datadir}/dbus-1/interfaces/org.gnome.ColorManager.xml
+%{_datadir}/dbus-1/services/org.gnome.ColorManager.service
+%{_datadir}/glib-2.0/schemas/org.gnome.color-manager.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.color.gschema.xml
 %{_datadir}/gnome-color-manager/
 %{_datadir}/icons/hicolor/*/apps/gnome-color-manager.*
 %{_datadir}/icons/hicolor/*/mimetypes/application-vnd.iccprofile.*
 %{_datadir}/polkit-1/actions/org.gnome.color.policy
 %{_mandir}/man?/*.*
 %{_sysconfdir}/xdg/autostart/*.desktop
-%{_datadir}/GConf/gsettings/org.gnome.color-manager.gschema.migrate
-%{_datadir}/glib-2.0/schemas/org.gnome.color-manager.gschema.xml
-%{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.color.gschema.xml
-%{_libdir}/gnome-settings-daemon-3.0/libcolor.so
-%{_libdir}/gnome-settings-daemon-3.0/color.gnome-settings-plugin
 %{_libexecdir}/gcm-helper-exiv
 %{_libdir}/control-center-1/panels/libcolor.so
+%{_libdir}/gnome-settings-daemon-3.0/libcolor.so
+%{_libdir}/gnome-settings-daemon-3.0/color.gnome-settings-plugin
 /lib/udev/gcm-udev-ddc
 
 %files -n libcolor-glib1
@@ -166,7 +165,7 @@ rm -rf %{buildroot}
 %files devel
 %defattr(-, root, root)
 %{_libdir}/*.so
-%{_includedir}/libcolor-glib
+%{_includedir}/libcolor-glib/
 %{_libdir}/pkgconfig/libcolor-glib.pc
 
 %files lang -f %{name}.lang