diff --git a/file-roller-2.30.0.tar.bz2 b/file-roller-2.30.0.tar.bz2
deleted file mode 100644
index a375bd2..0000000
--- a/file-roller-2.30.0.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1fa54fb3a2616506dc2908050adbb16128b70d60dad789b20817cd4b60102fa5
-size 1805950
diff --git a/file-roller-2.31.3.tar.bz2 b/file-roller-2.31.3.tar.bz2
new file mode 100644
index 0000000..186290c
--- /dev/null
+++ b/file-roller-2.31.3.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e01e6363c4ac059e9cf945668e2998824e291de8ab9a5340c4872af47b21e2fd
+size 1834994
diff --git a/file-roller-voidreturn.patch b/file-roller-voidreturn.patch
new file mode 100644
index 0000000..3129d81
--- /dev/null
+++ b/file-roller-voidreturn.patch
@@ -0,0 +1,13 @@
+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 2a69fb4..ec2b2a0 100644
--- a/file-roller.changes
+++ b/file-roller.changes
@@ -1,3 +1,38 @@
+-------------------------------------------------------------------
+Thu Jul  8 10:57:13 CEST 2010 - dimstar@opensuse.org
+
+- Update to version 2.31.3:
+  + Fixed segmentation fault when opening some rar arches
+  + bgo#576436: Use dpkg-deb to view and extract .deb files
+- Changes from version 2.31.2:
+  + bgo#620172: improved the "encrypt header" button usability.
+    always keep the "encrypt header" button clickable even when the
+    password field is void.
+- changes from version 2.31.1:
+  + Added support for lrzip archives and lrzip compressed tar
+    archives.
+  + bgo#617769: Bring back support for archives on remote GIO
+    mounts when the fuse daemon is not available.
+  + bgo#617840: Fixed crashes when trying to create a tar.z7
+    archive. due to a missing sentinel in a varargs call.
+  + Updated translations.
+- Remove gnome-common BuildRequires and call to gnome-autogen.sh.
+
+-------------------------------------------------------------------
+Wed May  5 19:24:57 CEST 2010 - meissner@suse.de
+
+- fixed 1 void return warning
+
+-------------------------------------------------------------------
+Thu Apr 29 14:23:48 CEST 2010 - dimstar@opensuse.org
+
+- Update to version 2.30.1.1:
+  + bgo#613298 - Extract multi-byte filename from URI in case of
+    DND
+- Changes from version 2.30.1:
+  + bgo#615127 - Fixed build error when dbus is not available
+  + Updated translations.
+
 -------------------------------------------------------------------
 Mon Mar 29 23:58:00 CEST 2010 - vuntz@opensuse.org
 
diff --git a/file-roller.spec b/file-roller.spec
index 555aa24..1f7f278 100644
--- a/file-roller.spec
+++ b/file-roller.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package file-roller (Version 2.30.0)
+# spec file for package file-roller (Version 2.31.3)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -18,13 +18,15 @@
 
 
 Name:           file-roller
-Version:        2.30.0
+Version:        2.31.3
 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
@@ -34,8 +36,6 @@ BuildRequires:  intltool
 BuildRequires:  nautilus-devel
 BuildRequires:  translation-update-upstream
 BuildRequires:  update-desktop-files
-# Needed for patch0 file-roller-fix-build.patch
-BuildRequires:  gnome-common
 Requires:       %{name}-lang = %{version}
 # Formats that we really want to support by default
 Requires:       bzip2
@@ -89,10 +89,10 @@ This package contains a plugin to integrate File Roller into Nautilus.
 %lang_package
 %prep
 %setup -q
+%patch0 -p1
 translation-update-upstream
 
 %build
-NOCONFIGURE=1 gnome-autogen.sh
 %configure\
 	--disable-schemas-install\
 	--disable-scrollkeeper