diff --git a/.cvsignore b/.cvsignore
index bc31b7b..3abcd8a 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-GConf-2.28.1.tar.bz2
+GConf-2.31.1.tar.bz2
diff --git a/GConf2.spec b/GConf2.spec
index c4851bd..b895055 100644
--- a/GConf2.spec
+++ b/GConf2.spec
@@ -1,17 +1,17 @@
 %define libxml2_version 2.4.12
 %define orbit2_version 2.8.0
-%define glib2_version 2.14.0
+%define glib2_version 2.25.0
 %define dbus_version 1.0.1
 %define dbus_glib_version 0.74
 
 Summary: A process-transparent configuration system
 Name: GConf2
-Version: 2.28.1
+Version: 2.31.1
 Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Base
 #VCS: git:git://git.gnome.org/gconf
-Source0: http://download.gnome.org/sources/GConf/2.28/GConf-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/GConf/2.31/GConf-%{version}.tar.bz2
 Source1: macros.gconf2
 URL: http://projects.gnome.org/gconf/
 
@@ -100,6 +100,7 @@ install -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/GConf/2/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/gio/modules/*.la
 
 %find_lang %name
 
@@ -128,7 +129,9 @@ fi
 %dir %{_sysconfdir}/gconf/gconf.xml.mandatory
 %dir %{_sysconfdir}/gconf/gconf.xml.system
 %dir %{_sysconfdir}/gconf/schemas
-%{_bindir}/*
+%{_bindir}/gconf-merge-tree
+%{_bindir}/gconftool-2
+%{_bindir}/gsettings-data-convert
 %{_libexecdir}/gconfd-2
 %{_libdir}/*.so.*
 %{_libdir}/GConf/2/*.so
@@ -146,6 +149,8 @@ fi
 # Something else should probably own this, but I'm not sure what.
 %dir %{_localstatedir}/lib/rpm-state/
 %{_localstatedir}/lib/rpm-state/gconf/
+%{_libdir}/gio/modules/libgsettingsgconfbackend.so
+%{_libdir}/girepository-1.0
 
 %files gtk
 %defattr(-, root, root)
@@ -158,8 +163,13 @@ fi
 %{_datadir}/aclocal/*.m4
 %{_datadir}/gtk-doc/html/gconf
 %{_libdir}/pkgconfig/*
+%{_datadir}/gir-1.0
 
 %changelog
+* Mon Apr 19 2010 Matthias Clasen <mclasen@redhat.com> - 2.23.1-1
+- Update to 2.31.1
+- Include introspection data
+
 * Tue Mar 30 2010 Matthias Clasen <mclasen@redhat.com> - 2.28.1-1
 - Update to 2.28.1
 
diff --git a/sources b/sources
index 086b1eb..58e5c8a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-27663faf0af4f6a6d534de9270f6d24a  GConf-2.28.1.tar.bz2
+156d7415e9f128a071182c134e6f192d  GConf-2.31.1.tar.bz2