diff --git a/.cvsignore b/.cvsignore
index 9c37e8c..fc302bb 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-file-roller-2.31.3.tar.bz2
+file-roller-2.31.4.tar.bz2
diff --git a/file-roller.spec b/file-roller.spec
index 1aba80e..48558f0 100644
--- a/file-roller.spec
+++ b/file-roller.spec
@@ -1,6 +1,5 @@
 %define glib2_version 2.16.0
 %define pango_version 1.8.0
-%define gtk2_version 2.16.0
 %define libgnomeui_version 2.6.0
 %define libgnomeprint_version 2.2.0
 %define libgnomeprintui_version 2.2.0
@@ -10,8 +9,8 @@
 
 Summary:	Tool for viewing and creating archives
 Name:		file-roller
-Version:	2.31.3
-Release: 	2%{?dist}
+Version:	2.31.4
+Release: 	1%{?dist}
 License:	GPLv2+
 Group:		Applications/Archiving
 URL:		http://download.gnome.org/sources/file-roller/
@@ -20,7 +19,7 @@ Source:		http://download.gnome.org/sources/file-roller/2.31/file-roller-%{versio
 
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: pango-devel >= %{pango_version}
-BuildRequires: gtk2-devel >= %{gtk2_version}
+BuildRequires: gtk3-devel
 BuildRequires: libglade2-devel
 BuildRequires: nautilus-devel >= %{nautilus_version}
 BuildRequires: libtool
@@ -28,14 +27,10 @@ BuildRequires: gettext
 BuildRequires: libSM-devel
 BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
 BuildRequires: gnome-doc-utils >= %{gnome_doc_utils_version}
-BuildRequires: GConf2-devel
-BuildRequires: dbus-glib-devel
 BuildRequires: intltool
+BuildRequires: GConf2-devel
 
 Requires(pre): GConf2
-Requires(post): GConf2
-Requires(preun): GConf2
-Requires: GConf2
 
 # The context menu API changed in 2.2.0:
 Conflicts: nautilus < 2.2.0
@@ -75,23 +70,21 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/icon-theme.cache
 
 %post
 update-desktop-database &> /dev/null || :
-%gconf_schema_upgrade file-roller
 touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
 
 %pre
-%gconf_schema_prepare file-roller
-
-%preun
-%gconf_schema_remove file-roller
+%gconf_schema_obsolete file-roller
 
 %postun
 update-desktop-database &> /dev/null || :
+glib-compile-schemas %{_datadir}/glib-2.0/schemas || :
 if [ $1 -eq 0 ]; then
   touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
   gtk-update-icon-cache -q %{_datadir}/icons/hicolor &> /dev/null || :
 fi
 
 %posttrans
+glib-compile-schemas %{_datadir}/glib-2.0/schemas || :
 gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 %files -f %{name}.lang
@@ -100,13 +93,17 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_bindir}/file-roller
 %{_datadir}/file-roller
 %{_datadir}/applications/gnome-file-roller.desktop
-%{_sysconfdir}/gconf/schemas/file-roller.schemas
 %{_libdir}/nautilus/extensions-2.0/libnautilus-fileroller.so
 %{_libexecdir}/file-roller
 %{_datadir}/icons/hicolor/*/apps/file-roller.png
 %{_datadir}/icons/hicolor/scalable/apps/file-roller.svg
+%{_datadir}/glib-2.0/schemas/org.gnome.file-roller.gschema.xml
+
 
 %changelog
+* Mon Jul 12 2010 Matthias Clasen <mclasen@redhat.com> 2.31.4-1
+- Update to 2.31.4
+
 * Tue Jun 29 2010 Matthias Clasen <mclasen@redhat.com> 2.31.3-2
 - Update to 2.31.3
 
diff --git a/sources b/sources
index b18d956..e2807fe 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-57978258a6d710b7117bfd5b7594c00b  file-roller-2.31.3.tar.bz2
+a32b391f4ec0331f648d454d6dd1c6e2  file-roller-2.31.4.tar.bz2