diff --git a/ChangeLog b/ChangeLog
index 12e4d9843f..528f38aa81 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Oct 13 20:20:51 2002  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+	* gtk/gtktooltips.c (gtk_tooltips_force_window): Make tooltip
+	window not resizable. Fixes #95675.
+
 Sun Oct 13 18:50:14 2002  Soeren Sandmann  <sandmann@daimi.au.dk>
 
 	* gtkmenu.c, gtkmenu.sgml, gtkitemfactory.c, gdkwindow.c,
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 12e4d9843f..528f38aa81 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Sun Oct 13 20:20:51 2002  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+	* gtk/gtktooltips.c (gtk_tooltips_force_window): Make tooltip
+	window not resizable. Fixes #95675.
+
 Sun Oct 13 18:50:14 2002  Soeren Sandmann  <sandmann@daimi.au.dk>
 
 	* gtkmenu.c, gtkmenu.sgml, gtkitemfactory.c, gdkwindow.c,
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 12e4d9843f..528f38aa81 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Sun Oct 13 20:20:51 2002  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+	* gtk/gtktooltips.c (gtk_tooltips_force_window): Make tooltip
+	window not resizable. Fixes #95675.
+
 Sun Oct 13 18:50:14 2002  Soeren Sandmann  <sandmann@daimi.au.dk>
 
 	* gtkmenu.c, gtkmenu.sgml, gtkitemfactory.c, gdkwindow.c,
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 12e4d9843f..528f38aa81 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Sun Oct 13 20:20:51 2002  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+	* gtk/gtktooltips.c (gtk_tooltips_force_window): Make tooltip
+	window not resizable. Fixes #95675.
+
 Sun Oct 13 18:50:14 2002  Soeren Sandmann  <sandmann@daimi.au.dk>
 
 	* gtkmenu.c, gtkmenu.sgml, gtkitemfactory.c, gdkwindow.c,
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 12e4d9843f..528f38aa81 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Sun Oct 13 20:20:51 2002  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+	* gtk/gtktooltips.c (gtk_tooltips_force_window): Make tooltip
+	window not resizable. Fixes #95675.
+
 Sun Oct 13 18:50:14 2002  Soeren Sandmann  <sandmann@daimi.au.dk>
 
 	* gtkmenu.c, gtkmenu.sgml, gtkitemfactory.c, gdkwindow.c,
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 12e4d9843f..528f38aa81 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Sun Oct 13 20:20:51 2002  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+	* gtk/gtktooltips.c (gtk_tooltips_force_window): Make tooltip
+	window not resizable. Fixes #95675.
+
 Sun Oct 13 18:50:14 2002  Soeren Sandmann  <sandmann@daimi.au.dk>
 
 	* gtkmenu.c, gtkmenu.sgml, gtkitemfactory.c, gdkwindow.c,
diff --git a/gtk/gtktooltips.c b/gtk/gtktooltips.c
index f301651305..dea1f46ff7 100644
--- a/gtk/gtktooltips.c
+++ b/gtk/gtktooltips.c
@@ -190,6 +190,7 @@ gtk_tooltips_force_window (GtkTooltips *tooltips)
       gtk_window_set_screen (GTK_WINDOW (tooltips->tip_window),
 			     gtk_widget_get_screen (tooltips->active_tips_data->widget));
       gtk_widget_set_app_paintable (tooltips->tip_window, TRUE);
+      gtk_window_set_resizable (GTK_WINDOW (tooltips->tip_window), FALSE);
       gtk_widget_set_name (tooltips->tip_window, "gtk-tooltips");
       gtk_container_set_border_width (GTK_CONTAINER (tooltips->tip_window), 4);