diff --git a/file-roller-ximian-defaults.patch b/file-roller-ximian-defaults.patch
deleted file mode 100644
index b4875ea..0000000
--- a/file-roller-ximian-defaults.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nru -x '*~' -x '*.o' -x '*.orig' -x '*.rej' file-roller-2.0.4.orig/src/file-roller.schemas file-roller-2.0.4/src/file-roller.schemas
---- file-roller-2.0.4.orig/data/file-roller.schemas	Sun Nov  3 10:50:50 2002
-+++ file-roller-2.0.4/data/file-roller.schemas	Tue Nov  5 16:35:09 2002
-@@ -50,7 +50,7 @@
- 	<applyto>/apps/file-roller/listing/list_mode</applyto>
-         <owner>file-roller</owner>
-         <type>string</type>
--        <default>as_folder</default>
-+        <default>all_files</default>
-         <locale name="C">
-           <short>List Mode</short>
-           <long>Whether to view all files in the archive (all_files), or
diff --git a/file-roller.changes b/file-roller.changes
index 18ffb77..fe4a54d 100644
--- a/file-roller.changes
+++ b/file-roller.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Mar 13 16:58:01 CET 2008 - sbrabec@suse.cz
+
+- Custom look'n'feel gconf keys moved to gconf2-branding-openSUSE.
+
 -------------------------------------------------------------------
 Tue Mar  4 23:03:43 CET 2008 - maw@suse.de
 
diff --git a/file-roller.spec b/file-roller.spec
index 3f2eaa0..31909c8 100644
--- a/file-roller.spec
+++ b/file-roller.spec
@@ -16,12 +16,10 @@ BuildRequires:  docbook-xsl-stylesheets fdupes gconf2-devel glib2-devel gnome-do
 License:        GPL v2 or later
 Group:          System/GUI/GNOME
 Version:        2.21.92
-Release:        1
+Release:        4
 Requires:       %{name}-lang = %{version}
 Summary:        An Archive Manager for GNOME
 Source:         ftp://ftp.gnome.org/pub/GNOME/sources/file-roller/2.18/%{name}-%{version}.tar.bz2
-#PATCH-FIX-SUSE file-roller-ximian-defaults.patch -- Upstream thinks this is obsolete, needs confirmation
-Patch0:         file-roller-ximian-defaults.patch
 #PATCH-FIX-UPSTREAM file-roller-2.12.2-no-cmdline-overflow.patch bnc169646 bgo159240 hpj@novell.com -- Upstream thinks this is obsolete, needs confirmation
 Patch2:         file-roller-2.12.2-no-cmdline-overflow.patch
 #PATCH-FIX-UPSTREAM bug-187126_file-roller-batch-extract-all.patch bnc187126 bgo342043 jberkman@novell.com -- Upstream says this is committed but its not
@@ -73,7 +71,6 @@ Authors:
 %lang_package
 %prep
 %setup -q
-%patch -p1
 %patch2 -p1
 %patch3 -p1
 %patch5 -p1
@@ -129,6 +126,8 @@ fi
 %files lang -f %name.lang
 
 %changelog
+* Thu Mar 13 2008 sbrabec@suse.cz
+- Custom look'n'feel gconf keys moved to gconf2-branding-openSUSE.
 * Wed Mar 05 2008 maw@suse.de
 - Update to version 2.21.92:
   + Updated translations.