diff --git a/gnome-color-manager-2.31.6.tar.bz2 b/gnome-color-manager-2.31.6.tar.bz2
deleted file mode 100644
index 0405189..0000000
--- a/gnome-color-manager-2.31.6.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:17b435a6a9d95cf08b55fa0c808e716a7eb6bbb9369b12b00811bd85e2fa0556
-size 2275135
diff --git a/gnome-color-manager-2.31.91.tar.bz2 b/gnome-color-manager-2.31.91.tar.bz2
new file mode 100644
index 0000000..bb7ef6c
--- /dev/null
+++ b/gnome-color-manager-2.31.91.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c990d8ded2c61719e718b5fddd9bd5526725a68a7fbcdf1154f5ba3998475cd2
+size 2424036
diff --git a/gnome-color-manager.changes b/gnome-color-manager.changes
index b3e362d..9a69573 100644
--- a/gnome-color-manager.changes
+++ b/gnome-color-manager.changes
@@ -1,3 +1,33 @@
+-------------------------------------------------------------------
+Sat Sep 11 00:54:42 CEST 2010 - vuntz@opensuse.org
+
+- Make gcm-prefs.desktop appear where it should in the menu, by
+  replacing the categories: X-GNOME-SystemSettings needs to be
+  removed, and we want HardwareSettings instead.
+
+-------------------------------------------------------------------
+Wed Sep  8 00:06:11 CEST 2010 - vuntz@opensuse.org
+
+- Remove libgphoto2-devel BuildRequires: this was there only as a
+  workaround for bnc#592143.
+- Change old-style BuildRequires to pkgconfig() style
+  BuildRequires:
+  + old-style: dbus-1-glib-devel, gconf2-devel,
+    gnome-desktop-devel, gtk2-devel, libcanberra-devel,
+    libgudev-1_0-devel, liblcms-devel, libnotify-devel,
+    libunique-devel, vte-devel
+  + new-style: dbus-glib-1, gconf-2.0, glib-2.0, gnome-desktop-2.0,
+    gtk+-2.0, gudev-1.0, lcms, libcanberra-gtk, libnotify,
+    unique-1.0, vte, x11, xrandr, xxf86vm.
+- This will make it easier to switch to GNOME 3 libraries.
+
+-------------------------------------------------------------------
+Tue Aug 31 19:17:16 CEST 2010 - vuntz@opensuse.org
+
+- Update to version 2.31.91:
+  + Use a new application icon.
+  + Updated translations.
+
 -------------------------------------------------------------------
 Sat Aug  7 00:45:45 CEST 2010 - vuntz@opensuse.org
 
diff --git a/gnome-color-manager.spec b/gnome-color-manager.spec
index 42ea8bd..a438376 100644
--- a/gnome-color-manager.spec
+++ b/gnome-color-manager.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package gnome-color-manager (Version 2.31.6)
+# spec file for package gnome-color-manager (Version 2.31.91)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # Copyright (c) 2010 Luis Medinas, Portugal
@@ -20,36 +20,37 @@
 
 
 Name:           gnome-color-manager
-Version:        2.31.6
+Version:        2.31.91
 Release:        1
-# FIXME: check if libgphoto2-devel BuildRequires is still needed
 Summary:        Color management tools for GNOME
 License:        GPLv2+
 Group:          System/GUI/GNOME
 Url:            http://projects.gnome.org/gnome-color-manager
 Source:         %{name}-%{version}.tar.bz2
 BuildRequires:  cups-devel
-BuildRequires:  dbus-1-glib-devel
 BuildRequires:  docbook-utils
-BuildRequires:  gconf2-devel
 BuildRequires:  gnome-doc-utils-devel
-BuildRequires:  gnome-desktop-devel
-BuildRequires:  gtk2-devel
 BuildRequires:  intltool
-BuildRequires:  libcanberra-devel
-BuildRequires:  libgudev-1_0-devel
-BuildRequires:  liblcms-devel
-BuildRequires:  libnotify-devel
 BuildRequires:  libtiff-devel
-BuildRequires:  libunique-devel
 BuildRequires:  sane-backends
-BuildRequires:  vte-devel
 BuildRequires:  translation-update-upstream
 BuildRequires:  update-desktop-files
 # For directory ownership
 BuildRequires:  polkit
-# Only needed because of broken sane-backends dependency, see bnc#592143
-BuildRequires:  libgphoto2-devel
+BuildRequires:  pkgconfig(dbus-glib-1)
+BuildRequires:  pkgconfig(gconf-2.0)
+BuildRequires:  pkgconfig(glib-2.0)
+BuildRequires:  pkgconfig(gnome-desktop-2.0)
+BuildRequires:  pkgconfig(gtk+-2.0)
+BuildRequires:  pkgconfig(gudev-1.0)
+BuildRequires:  pkgconfig(lcms)
+BuildRequires:  pkgconfig(libcanberra-gtk)
+BuildRequires:  pkgconfig(libnotify)
+BuildRequires:  pkgconfig(unique-1.0)
+BuildRequires:  pkgconfig(vte)
+BuildRequires:  pkgconfig(x11)
+BuildRequires:  pkgconfig(xrandr)
+BuildRequires:  pkgconfig(xxf86vm)
 Requires:       %{name}-lang = %{version}
 Requires:       PackageKit
 Requires:       shared-color-profiles
@@ -74,7 +75,9 @@ translation-update-upstream
 
 %install
 %makeinstall
-%suse_update_desktop_file gcm-prefs GNOME HardwareSettings
+# X-GNOME-SystemSettings is okay upstream, but it makes the item appear misplaced with our menu structure
+grep -q X-GNOME-SystemSettings %{buildroot}%{_datadir}/applications/gcm-prefs.desktop
+%suse_update_desktop_file -r gcm-prefs GNOME Settings HardwareSettings
 %suse_update_desktop_file gcm-apply
 %suse_update_desktop_file gcm-import
 %find_lang %{name}