diff --git a/gtk-combo-box-dont-use-invalidated-iter.patch b/gtk-combo-box-dont-use-invalidated-iter.patch
new file mode 100644
index 0000000..e378dc9
--- /dev/null
+++ b/gtk-combo-box-dont-use-invalidated-iter.patch
@@ -0,0 +1,15 @@
+--- gtk+-2.24.20/gtk/gtkcombobox.c.org  2013-03-12 22:25:23.000000000 +0200
++++ gtk+-2.24.20/gtk/gtkcombobox.c      2013-07-20 23:38:34.248516146 +0300
+@@ -4152,11 +4152,11 @@
+   if (!ret)
+     return TRUE; /* clicked outside window? */
+ 
++  gtk_combo_box_popdown (combo_box);
++
+   gtk_tree_model_get_iter (priv->model, &iter, path);
+   gtk_tree_path_free (path);
+ 
+-  gtk_combo_box_popdown (combo_box);
+-
+   if (tree_column_row_is_sensitive (combo_box, &iter))
+     gtk_combo_box_set_active_iter (combo_box, &iter);
diff --git a/mingw-gtk2.spec b/mingw-gtk2.spec
index 1d18aaa..7944262 100644
--- a/mingw-gtk2.spec
+++ b/mingw-gtk2.spec
@@ -2,7 +2,7 @@
 
 Name:           mingw-gtk2
 Version:        2.24.20
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        MinGW Windows Gtk2 library
 
 License:        LGPLv2+
@@ -33,6 +33,12 @@ Patch15:        window-dragging.patch
 # http://mingw-w64.svn.sourceforge.net/viewvc/mingw-w64?view=revision&revision=5589
 Patch16:        gtk-dont-define-initguid.patch
 
+# Don't use invalidated iter in GtkComboBox
+# Resolves segfaults in GtkFileChooserButton
+# https://bugzilla.redhat.com/show_bug.cgi?id=985559
+# https://bugzilla.gnome.org/show_bug.cgi?id=704508
+Patch17:        gtk-combo-box-dont-use-invalidated-iter.patch
+
 # Fix use of extended buttons in gtkstatusicon.
 Patch1000:      mingw32-gtk2-2.15.0-xbuttons.patch
 
@@ -134,6 +140,7 @@ Static version of the MinGW Windows Gtk2 library.
 %patch8 -p1 -b .tooltip-positioning
 %patch15 -p1 -b .window-dragging
 %patch16 -p0 -b .knownfolders
+%patch17 -p1 -b .combobox_iter
 
 %patch1000 -p1
 autoreconf -i --force
@@ -323,6 +330,10 @@ rm -f $RPM_BUILD_ROOT%{mingw64_libdir}/gtk-2.0/modules/*.dll.a
 
 
 %changelog
+* Sun Aug  4 2013 Erik van Pienbroek <epienbro@fedoraproject.org> - 2.24.20-3
+- Prevent segfault in GtkFileChooserButton caused by the use
+  of an invalidated iter in GtkComboBox (RHBZ #985559, GNOME BZ #704508)
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.24.20-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild