diff --git a/file-roller-2.31.3.tar.bz2 b/file-roller-2.31.3.tar.bz2
deleted file mode 100644
index 186290c..0000000
--- a/file-roller-2.31.3.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e01e6363c4ac059e9cf945668e2998824e291de8ab9a5340c4872af47b21e2fd
-size 1834994
diff --git a/file-roller-2.31.4.tar.bz2 b/file-roller-2.31.4.tar.bz2
new file mode 100644
index 0000000..367fd97
--- /dev/null
+++ b/file-roller-2.31.4.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:be0310d57804c27bb4550298648ae5da350bd9e982f1b89d2a3939cd479f2a49
+size 1832150
diff --git a/file-roller-voidreturn.patch b/file-roller-voidreturn.patch
deleted file mode 100644
index 3129d81..0000000
--- a/file-roller-voidreturn.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: file-roller-2.30.1.1/src/eggtreemultidnd.c
-===================================================================
---- file-roller-2.30.1.1.orig/src/eggtreemultidnd.c
-+++ file-roller-2.30.1.1/src/eggtreemultidnd.c
-@@ -310,7 +310,7 @@ egg_tree_multi_drag_motion_event (GtkWid
-       selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (widget));
-       gtk_tree_selection_selected_foreach (selection, selection_foreach, &path_list);
-       if (path_list == NULL)
--	      return;
-+	      return FALSE;
- 
-       path_list = g_list_reverse (path_list);
- 
diff --git a/file-roller.changes b/file-roller.changes
index 52e8fb5..7447132 100644
--- a/file-roller.changes
+++ b/file-roller.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Jul 26 14:14:22 CEST 2010 - dimstar@opensuse.org
+
+- Update to version 2.31.4:
+  + bgo#622900: Migrated from dbus-glib to glib's GDBus
+  + Ported to GSettings
+  + Updated translations.
+- Drop file-roller-voidreturn.patch, upstream fixed.
+- Replace gconf scriptlets with gsettings scriptlets.
+
 -------------------------------------------------------------------
 Thu Jul  8 10:57:13 CEST 2010 - dimstar@opensuse.org
 
diff --git a/file-roller.spec b/file-roller.spec
index ee62fcd..522bdc6 100644
--- a/file-roller.spec
+++ b/file-roller.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package file-roller (Version 2.31.3)
+# spec file for package file-roller (Version 2.31.4)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -18,15 +18,13 @@
 
 
 Name:           file-roller
-Version:        2.31.3
+Version:        2.31.4
 Release:        1
 License:        GPLv2+
 Summary:        An Archive Manager for GNOME
 Url:            http://fileroller.sourceforge.net
 Group:          Productivity/Archiving/Compression
 Source:         ftp://ftp.gnome.org/pub/GNOME/sources/file-roller/2.18/%{name}-%{version}.tar.bz2
-# PATCH-FIX-UPSTREAM file-runner-voidreturn.patch bgo#623818 meissner@suse.de -- Fix a warning regarding void return value.
-Patch0:         %name-voidreturn.patch
 BuildRequires:  fdupes
 BuildRequires:  gconf2-devel
 BuildRequires:  glib2-devel
@@ -66,7 +64,7 @@ DocDir:         %{_defaultdocdir}
 #Suggests:       unace
 #Suggests:       unalz
 #Suggests:       unstuff
-%gconf_schemas_prereq
+%glib2_gsettings_schema_requires
 
 %description
 File Roller is an archive manager for GNOME. With it, you can create
@@ -90,7 +88,6 @@ This package contains a plugin to integrate File Roller into Nautilus.
 %lang_package
 %prep
 %setup -q
-%patch0 -p1
 translation-update-upstream
 
 %build
@@ -106,30 +103,25 @@ translation-update-upstream
 %endif
 %suse_update_desktop_file -N "File Roller" -G "Archive Manager" %name Archiving
 %find_lang %{name}
-%find_gconf_schemas
 rm %{buildroot}%{_libdir}/*/*/*.*a
 %fdupes %{buildroot}
 
 %clean
 rm -rf %{buildroot}
 
-%pre -f %{name}.schemas_pre
-
 %post
+%glib2_gsettings_schema_post
 if test -x usr/bin/update-mime-database ; then
   usr/bin/update-mime-database usr/share/mime >/dev/null
 fi
 
-%posttrans -f %{name}.schemas_posttrans
-
-%preun -f %{name}.schemas_preun
-
 %postun
+%glib2_gsettings_schema_postun
 if test -x usr/bin/update-mime-database ; then
   usr/bin/update-mime-database usr/share/mime >/dev/null
 fi
 
-%files -f %{name}.schemas_list
+%files
 %defattr(-, root, root)
 %doc AUTHORS NEWS README COPYING
 %{_bindir}/file-roller
@@ -138,6 +130,7 @@ fi
 %{_datadir}/file-roller/
 %{_datadir}/icons/hicolor/*/apps/*.png
 %{_datadir}/icons/hicolor/scalable/apps/*.svg
+%{_datadir}/glib-2.0/schemas/org.gnome.file-roller.gschema.xml
 
 %files -n nautilus-file-roller
 %defattr(-, root, root)