diff --git a/gtk2.spec b/gtk2.spec
index 5501aa0..a48c832 100644
--- a/gtk2.spec
+++ b/gtk2.spec
@@ -16,7 +16,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gtk+/2.15/gtk+-%{version}.tar.bz2
@@ -30,6 +30,8 @@ Patch0: gtk+-2.13.5-lib64.patch
 Patch2: workaround.patch
 # http://bugzilla.redhat.com/show_bug.cgi?id=478400
 Patch3: default_printer.patch
+# fixed upstream
+Patch4: togglebutton-crash.patch
 
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -117,6 +119,7 @@ GTK+ widget toolkit.
 %patch0 -p1 -b .lib64
 %patch2 -p1 -b .workaround
 %patch3 -p0 -b .default-printer
+%patch4 -p0 -b .togglebutton-crash
 
 %build
 libtoolize --force --copy
@@ -294,6 +297,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-2.0
 
 %changelog
+* Tue Jan 27 2009 Matthias Clasen <mclasen@redhat.com> - 2.15.2-2
+- Fix togglebuttons causing crashes
+
 * Tue Jan 27 2009 Matthias Clasen <mclasen@redhat.com> - 2.15.2-1
 - Update to 2.15.2
 
diff --git a/togglebutton-crash.patch b/togglebutton-crash.patch
new file mode 100644
index 0000000..96b894c
--- /dev/null
+++ b/togglebutton-crash.patch
@@ -0,0 +1,14 @@
+Index: gtk/gtktogglebutton.c
+===================================================================
+--- gtk/gtktogglebutton.c	(revision 22218)
++++ gtk/gtktogglebutton.c	(working copy)
+@@ -502,7 +502,8 @@
+ 
+   g_object_notify (G_OBJECT (toggle_button), "active");
+ 
+-  GTK_BUTTON_CLASS (gtk_toggle_button_parent_class)->clicked (button);
++  if (GTK_BUTTON_CLASS (gtk_toggle_button_parent_class)->clicked)
++    GTK_BUTTON_CLASS (gtk_toggle_button_parent_class)->clicked (button);
+ }
+ 
+ static void