diff --git a/ChangeLog b/ChangeLog
index e717d344f6..1560cfbaf1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue May 20 17:05:31 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkwindow.c (gtk_window_compute_hints): Fix 
+	height/width confusion (#113370, Xan Lopez)
+
 Tue May 20 15:48:45 2003  Owen Taylor  <otaylor@redhat.com>
 
 	* gdk/x11/gdkdnd-x11.c gdk/x11/gdkwindow-x11.c: Comprehensively
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index e717d344f6..1560cfbaf1 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Tue May 20 17:05:31 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkwindow.c (gtk_window_compute_hints): Fix 
+	height/width confusion (#113370, Xan Lopez)
+
 Tue May 20 15:48:45 2003  Owen Taylor  <otaylor@redhat.com>
 
 	* gdk/x11/gdkdnd-x11.c gdk/x11/gdkwindow-x11.c: Comprehensively
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index e717d344f6..1560cfbaf1 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Tue May 20 17:05:31 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkwindow.c (gtk_window_compute_hints): Fix 
+	height/width confusion (#113370, Xan Lopez)
+
 Tue May 20 15:48:45 2003  Owen Taylor  <otaylor@redhat.com>
 
 	* gdk/x11/gdkdnd-x11.c gdk/x11/gdkwindow-x11.c: Comprehensively
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index e717d344f6..1560cfbaf1 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Tue May 20 17:05:31 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkwindow.c (gtk_window_compute_hints): Fix 
+	height/width confusion (#113370, Xan Lopez)
+
 Tue May 20 15:48:45 2003  Owen Taylor  <otaylor@redhat.com>
 
 	* gdk/x11/gdkdnd-x11.c gdk/x11/gdkwindow-x11.c: Comprehensively
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index e717d344f6..1560cfbaf1 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Tue May 20 17:05:31 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkwindow.c (gtk_window_compute_hints): Fix 
+	height/width confusion (#113370, Xan Lopez)
+
 Tue May 20 15:48:45 2003  Owen Taylor  <otaylor@redhat.com>
 
 	* gdk/x11/gdkdnd-x11.c gdk/x11/gdkwindow-x11.c: Comprehensively
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 751523025d..3e2ba8c83f 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -5382,7 +5382,7 @@ gtk_window_compute_hints (GtkWindow   *window,
 	new_geometry->max_width += extra_width;
 
       if (new_geometry->max_height < 0)
-	new_geometry->max_width = requisition.height;
+	new_geometry->max_height = requisition.height;
       else
 	new_geometry->max_height += extra_height;
     }