diff --git a/gtk2.spec b/gtk2.spec
index daa2e65..b4c62c9 100644
--- a/gtk2.spec
+++ b/gtk2.spec
@@ -17,7 +17,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gtk+/2.18/gtk+-%{version}.tar.bz2
@@ -34,6 +34,8 @@ Patch1: gtk2-printing-smb-auth.patch
 Patch2: gtk2-printing-nonblocking-printer-list.patch
 # from upstream
 Patch3: fix-anchors.patch
+# from upstream
+Patch4: iconview-crash.patch
 
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -148,6 +150,7 @@ This package contains developer documentation for the GTK+ widget toolkit.
 %patch1 -p1 -b .printing-smb-auth
 %patch2 -p1 -b .printing-nonblocking-printer-list
 %patch3 -p1 -b .fix-anchors
+%patch4 -p1 -b .iconview-crash
 
 # make sure that gtkmarshalers.{c, h} get regenerated during the build
 #  - caused by print_authentication.patch
@@ -389,6 +392,9 @@ fi
 
 
 %changelog
+* Mon Sep 28 2009 Matthias Clasen <mclasen@redhat.com> - 2.18.0-3
+- Fix a crash in the appearance capplet
+
 * Sun Sep 27 2009 Matthias Clasen <mclasen@redhat.com> - 2.18.0-2
 - Fix anchor handling in text views (#525910)
 
diff --git a/iconview-crash.patch b/iconview-crash.patch
new file mode 100644
index 0000000..90d547f
--- /dev/null
+++ b/iconview-crash.patch
@@ -0,0 +1,23 @@
+diff -up gtk+-2.18.0/gtk/gtkiconview.c.iconview-crash gtk+-2.18.0/gtk/gtkiconview.c
+--- gtk+-2.18.0/gtk/gtkiconview.c.iconview-crash	2009-09-28 12:38:46.956098207 -0400
++++ gtk+-2.18.0/gtk/gtkiconview.c	2009-09-28 12:40:03.636858596 -0400
+@@ -3469,6 +3469,9 @@ gtk_icon_view_get_item_at_coords (GtkIco
+   GList *items, *l;
+   GdkRectangle box;
+ 
++  if (cell_at_pos)
++    *cell_at_pos = NULL;
++
+   for (items = icon_view->priv->items; items; items = items->next)
+     {
+       GtkIconViewItem *item = items->data;
+@@ -3503,9 +3506,6 @@ gtk_icon_view_get_item_at_coords (GtkIco
+ 		    }
+ 		}
+ 
+-	      if (cell_at_pos)
+-		*cell_at_pos = NULL;
+-
+ 	      if (only_in_cell)
+ 		return NULL;
+ 	    }