diff --git a/.gitignore b/.gitignore
index 78a0589..afb980a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ gnome-color-manager-2.31.4.tar.bz2
 /gnome-color-manager-2.91.5.tar.bz2
 /gnome-color-manager-2.91.92.tar.bz2
 /gnome-color-manager-3.0.0.tar.bz2
+/gnome-color-manager-3.1.1.tar.bz2
diff --git a/gnome-color-manager.spec b/gnome-color-manager.spec
index de1501d..55c8319 100644
--- a/gnome-color-manager.spec
+++ b/gnome-color-manager.spec
@@ -1,8 +1,6 @@
-%define alphatag                                20101102
-
 Summary:   Color management tools for GNOME
 Name:      gnome-color-manager
-Version:   3.0.0
+Version:   3.1.1
 Release:   1%{?dist}
 License:   GPLv2+
 Group:     Applications/System
@@ -16,46 +14,43 @@ Requires:  shared-color-profiles
 Requires:  dconf
 Requires:  GConf2 >= 2.31.1
 
-BuildRequires: gtk3-devel >= 2.99.0
+BuildRequires: gtk3-devel >= 3.0.0
 BuildRequires: scrollkeeper
 BuildRequires: gnome-doc-utils >= 0.3.2
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
 BuildRequires: libtool
-#BuildRequires: vte-devel
+BuildRequires: vte3-devel
 BuildRequires: gnome-doc-utils
 BuildRequires: intltool
 BuildRequires: libgudev1-devel
 BuildRequires: libXrandr-devel
 BuildRequires: lcms2-devel
-BuildRequires: cups-devel
-BuildRequires: sane-backends-devel
 BuildRequires: libtiff-devel
 BuildRequires: libexif-devel
 BuildRequires: exiv2-devel
 BuildRequires: libcanberra-devel
 BuildRequires: libnotify-devel >= 0.7.0
 BuildRequires: glib2-devel >= 2.25.9-2
-BuildRequires: control-center-devel >= 2.90.1
-BuildRequires: gnome-settings-daemon-devel >= 2.90.1
-BuildRequires: libusb1-devel
 BuildRequires: docbook-utils
+BuildRequires: colord-devel
+BuildRequires: libmash-devel
+BuildRequires: clutter-gtk-devel
+
+# GNOME and KDE have different session policy agents
+Provides: color-policy-agent
 
 Requires(post):   /usr/bin/gtk-update-icon-cache
 Requires(postun): /usr/bin/gtk-update-icon-cache
 
+# obsolete sub-package
+Obsoletes: gnome-color-manager-devel <= 3.1.1
+Provides: gnome-color-manager-devel
+
 %description
 gnome-color-manager is a session framework that makes it easy to manage, install
 and generate color profiles in the GNOME desktop.
 
-%package devel
-Summary: Development package for %{name}
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-
-%description devel
-Files for development with %{name}.
-
 %prep
 %setup -q
 
@@ -72,10 +67,6 @@ for i in gcm-prefs gcm-import ; do
     $RPM_BUILD_ROOT%{_datadir}/applications/$i.desktop
 done
 
-# Remove static libs and libtool archives.
-find %{buildroot} -name '*.la' -exec rm -f {} ';'
-find %{buildroot} -name '*.a' -exec rm -f {} ';'
-
 %find_lang %name --with-gnome
 
 %post
@@ -83,7 +74,6 @@ touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 update-desktop-database %{_datadir}/applications &> /dev/null || :
 update-mime-database %{_datadir}/mime &> /dev/null || :
 glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
-/sbin/ldconfig
 
 %postun
 if [ $1 -eq 0 ]; then
@@ -93,7 +83,6 @@ 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 || :
-/sbin/ldconfig
 
 %posttrans
 gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
@@ -101,35 +90,32 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING NEWS README
-/lib/udev/rules.d/*.rules
-/lib/udev/gcm-*
 %{_bindir}/gcm-*
-%{_sbindir}/gcm-install-system-wide
-%{_libexecdir}/*
-%{_sysconfdir}/xdg/autostart/*.desktop
-%{_datadir}/gnome-color-manager/
+%{_libexecdir}/gcm-helper-exiv
+%dir %{_datadir}/gnome-color-manager
+%{_datadir}/gnome-color-manager/gcm-*.ui
+%dir %{_datadir}/gnome-color-manager/targets
+%dir %{_datadir}/gnome-color-manager/icons
+%{_datadir}/gnome-color-manager/targets
+%{_datadir}/gnome-color-manager/icons
+%{_datadir}/gnome-color-manager/figures
 %{_datadir}/man/man1/*.1.gz
+%{_datadir}/gnome/help/gnome-color-manager
+%{_datadir}/omf/gnome-color-manager
 %{_datadir}/icons/hicolor/*/*/*.png
 %{_datadir}/icons/hicolor/scalable/*/*.svg*
 %{_datadir}/applications/gcm-*.desktop
-%{_datadir}/dbus-1/interfaces/org.gnome.ColorManager.xml
+%{_sysconfdir}/xdg/autostart/*.desktop
 %{_datadir}/dbus-1/services/org.gnome.ColorManager.service
-%{_datadir}/polkit-1/actions/org.gnome.color.policy
 %{_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}/GConf/gsettings/org.gnome.color-manager.gschema.migrate
-%{_libdir}/libcolor-glib.so.1
-%{_libdir}/libcolor-glib.so.1.0.0
-%{_libdir}/control-center-1/panels/*.so
-%{_libdir}/gnome-settings-daemon-3.0/color.gnome-settings-plugin
-%{_libdir}/gnome-settings-daemon-3.0/libcolor.so
-
-%files devel
-%{_includedir}/libcolor-glib/*.h
-%{_libdir}/libcolor-glib.so
-%{_libdir}/pkgconfig/libcolor-glib.pc
+%{_datadir}/dbus-1/interfaces/org.gnome.ColorManager.xml
 
 %changelog
+* Fri May 06 2011 Richard Hughes <rhughes@redhat.com> - 3.1.1-1
+- New upstream version.
+
 * Mon Apr 04 2011 Richard Hughes <rhughes@redhat.com> - 3.0.0-1
 - New upstream version.
 
diff --git a/sources b/sources
index c79102a..10d7439 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6195fc713212afd189fd280977e85c92  gnome-color-manager-3.0.0.tar.bz2
+0fa397ff2737a9f85648e97f00d959f2  gnome-color-manager-3.1.1.tar.bz2