diff --git a/ChangeLog b/ChangeLog
index 2d5b496cb7..c07a4cf049 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-28  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtktooltips.c (gtk_tooltips_timeout): Set timer_tag to 0 when
+	the timeout is done.  (#322291, Jean-Yves Lefort)
+
 2005-11-28  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtkfilechooserdefault.c (shortcuts_key_press_event_cb): Make
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 2d5b496cb7..c07a4cf049 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2005-11-28  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtktooltips.c (gtk_tooltips_timeout): Set timer_tag to 0 when
+	the timeout is done.  (#322291, Jean-Yves Lefort)
+
 2005-11-28  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtkfilechooserdefault.c (shortcuts_key_press_event_cb): Make
diff --git a/gtk/gtktooltips.c b/gtk/gtktooltips.c
index 3c720c5e4d..7fdf526c74 100644
--- a/gtk/gtktooltips.c
+++ b/gtk/gtktooltips.c
@@ -481,6 +481,8 @@ gtk_tooltips_timeout (gpointer data)
       GTK_WIDGET_DRAWABLE (tooltips->active_tips_data->widget))
     gtk_tooltips_draw_tips (tooltips);
 
+  tooltips->timer_tag = 0;
+
   GDK_THREADS_LEAVE ();
 
   return FALSE;