diff --git a/gtk2.spec b/gtk2.spec
index 9bf5d64..515b12c 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: 2%{?dist}
+Release: 3%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gtk+/2.11/gtk+-%{version}.tar.bz2
@@ -33,6 +33,8 @@ Patch2: workaround.patch
 # fixed in upstream svn
 Patch3: novalidate.patch
 Patch4: libtracker.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=460194
+Patch5: swt-tooltips.patch
 
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -121,6 +123,7 @@ docs for the GTK+ widget toolkit.
 %patch2 -p1 -b .workaround
 %patch3 -p1 -b .novalidate
 %patch4 -p1 -b .libtracker
+%patch5 -p1 -b .swt-tooltips
 
 for i in config.guess config.sub ; do
   test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i .
@@ -303,6 +306,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-2.0
 
 %changelog
+* Thu Sep 20 2007 Matthias Clasen <mclasen@redhat.com> - 2.12.0-3
+- Fix a problem with swt and tooltips 
+
 * Tue Sep 18 2007 Matthias Clasen <mclasen@redhat.com> - 2.12.0-2
 - Adapt to tracker ABI changes
 
diff --git a/swt-tooltips.patch b/swt-tooltips.patch
new file mode 100644
index 0000000..fcefad2
--- /dev/null
+++ b/swt-tooltips.patch
@@ -0,0 +1,13 @@
+diff -up gtk+-2.12.0/gtk/gtktooltips.c.swt-tooltips gtk+-2.12.0/gtk/gtktooltips.c
+--- gtk+-2.12.0/gtk/gtktooltips.c.swt-tooltips	2007-09-20 15:47:54.000000000 -0400
++++ gtk+-2.12.0/gtk/gtktooltips.c	2007-09-20 15:48:22.000000000 -0400
+@@ -229,7 +229,8 @@ gtk_tooltips_set_tip (GtkTooltips *toolt
+       return;
+     }
+   
+-  if (tooltips->active_tips_data 
++  if (tooltipsdata &&
++      && tooltips->active_tips_data 
+       && tooltips->active_tips_data->widget == widget
+       && GTK_WIDGET_DRAWABLE (tooltips->active_tips_data->widget))
+     {