diff --git a/gnome-color-manager.spec b/gnome-color-manager.spec
index dce0c6c..497d80b 100644
--- a/gnome-color-manager.spec
+++ b/gnome-color-manager.spec
@@ -1,24 +1,23 @@
-%define alphatag                        20100222
-
 %{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Summary:   Color management tools for GNOME
 Name:      gnome-color-manager
-Version:   2.31.1
-#Release:   0.1.%{?alphatag}git%{?dist}
+Version:   2.31.2
 Release:   1%{?dist}
 License:   GPLv2+
 Group:     Applications/System
 URL:       http://projects.gnome.org/gnome-color-manager/
 Source0:   http://download.gnome.org/sources/gnome-color-manager/2.31/%{name}-%{version}.tar.gz
-#Source0:   http://download.gnome.org/sources/gnome-color-manager/2.31/%{name}-%{version}-%{?alphatag}.tar.gz
 
+Requires:  color-filesystem >= 1-7
 Requires:  gnome-icon-theme
 Requires:  shared-mime-info
 Requires:  shared-color-profiles
-Requires(pre):    GConf2
-Requires(post):   GConf2
-Requires(preun):  GConf2
+Requires:  yelp
+Requires:  dconf
+Requires:  GConf2 >= 2.31.1
+Requires(post):   scrollkeeper
+Requires(postun): scrollkeeper
 
 BuildRequires: gtk2-devel >= 2.16.0
 BuildRequires: scrollkeeper
@@ -31,7 +30,6 @@ BuildRequires: gnome-doc-utils
 BuildRequires: unique-devel >= 1.0.0
 BuildRequires: intltool
 BuildRequires: libgudev1-devel
-BuildRequires: dbus-glib-devel >= 0.73
 BuildRequires: libXxf86vm-devel
 BuildRequires: libXrandr-devel
 BuildRequires: gnome-desktop-devel
@@ -39,9 +37,11 @@ BuildRequires: lcms-devel
 BuildRequires: cups-devel
 BuildRequires: sane-backends-devel
 BuildRequires: libtiff-devel
+BuildRequires: libexif-devel
+BuildRequires: exiv2-devel
 BuildRequires: libcanberra-devel
 BuildRequires: libnotify-devel
-BuildRequires: GConf2
+BuildRequires: glib2-devel >= 2.25.1
 
 %description
 gnome-color-manager is a session framework that makes it easy to manage, install
@@ -49,7 +49,6 @@ and generate color profiles in the GNOME desktop.
 
 %prep
 %setup -q
-#%setup -q -n %{?name}-%{?version}-%{?alphatag}
 
 %build
 %configure --disable-scrollkeeper --disable-schemas-install
@@ -67,16 +66,10 @@ done
 %find_lang %name --with-gnome
 
 %post
-%gconf_schema_upgrade gnome-color-manager
-touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 update-desktop-database %{_datadir}/applications &> /dev/null || :
 update-mime-database %{_datadir}/mime &> /dev/null || :
-
-%pre
-%gconf_schema_prepare gnome-color-manager
-
-%preun
-%gconf_schema_remove gnome-color-manager
+glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 
 %postun
 if [ $1 -eq 0 ]; then
@@ -85,6 +78,7 @@ if [ $1 -eq 0 ]; then
 fi
 update-desktop-database %{_datadir}/applications &> /dev/null || :
 update-mime-database %{_datadir}/mime &> /dev/null || :
+glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 
 %posttrans
 gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
@@ -94,6 +88,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 %doc AUTHORS COPYING NEWS README
 /lib/udev/rules.d/*.rules
 %{_bindir}/gcm-*
+%{_libexecdir}/*
 %dir %{_datadir}/gnome-color-manager
 %{_datadir}/gnome-color-manager/gcm-*.ui
 %dir %{_datadir}/gnome-color-manager/targets
@@ -105,18 +100,20 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 %{_datadir}/omf/gnome-color-manager
 %{_datadir}/icons/hicolor/*/*/*.png
 %{_datadir}/icons/hicolor/scalable/*/*.svg*
-%config(noreplace) %{_sysconfdir}/gconf/schemas/*.schemas
 %{_datadir}/applications/gcm-prefs.desktop
 %{_datadir}/applications/gcm-import.desktop
 %{_sysconfdir}/xdg/autostart/*.desktop
 %{_datadir}/dbus-1/services/org.gnome.ColorManager.service
 %{_sbindir}/gcm-install-system-wide
 %{_datadir}/polkit-1/actions/org.gnome.color.policy
-
-# this is probably better in a shared package
-%dir %{_localstatedir}/lib/color
+%{_datadir}/glib-2.0/schemas/org.gnome.color-manager.gschema.xml
+%{_datadir}/GConf/gsettings/org.gnome.color-manager.gschema.migrate
+%{_datadir}/dbus-1/interfaces/org.gnome.ColorManager.xml
 
 %changelog
+* Wed Jun 02 2010 Richard Hughes <richard@hughsie.com> 2.31.2-1
+- New upstream release.
+
 * Thu May 06 2010 Richard Hughes <richard@hughsie.com> 2.31.1-1
 - New upstream release.