diff --git a/ChangeLog b/ChangeLog
index c7e65f25b3..1018ae5513 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-26  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkcombobox.c (gtk_combo_box_list_auto_scroll): Make 
+	autoscrolling work at the bottom of the screen.
+
 2005-05-26  Maciej Katafiasz  <email@mathrick.org>
 
 	* docs/reference/gtk/tmpl/gtkentry.sgml:
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index c7e65f25b3..1018ae5513 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2005-05-26  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkcombobox.c (gtk_combo_box_list_auto_scroll): Make 
+	autoscrolling work at the bottom of the screen.
+
 2005-05-26  Maciej Katafiasz  <email@mathrick.org>
 
 	* docs/reference/gtk/tmpl/gtkentry.sgml:
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index c7e65f25b3..1018ae5513 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2005-05-26  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkcombobox.c (gtk_combo_box_list_auto_scroll): Make 
+	autoscrolling work at the bottom of the screen.
+
 2005-05-26  Maciej Katafiasz  <email@mathrick.org>
 
 	* docs/reference/gtk/tmpl/gtkentry.sgml:
diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index f03ebb7ace..e88dc485d1 100644
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -3621,10 +3621,10 @@ gtk_combo_box_list_auto_scroll (GtkComboBox *combo_box,
 	  value = adj->value - (tree_view->allocation.y - y + 1);
 	  gtk_adjustment_set_value (adj, CLAMP (value, adj->lower, adj->upper - adj->page_size));
 	}
-      else if (y >= tree_view->allocation.y + tree_view->allocation.height &&
+      else if (y >= tree_view->allocation.height &&
 	       adj->upper - adj->page_size > adj->value)
 	{
-	  value = adj->value + (y - tree_view->allocation.y - tree_view->allocation.height + 1);
+	  value = adj->value + (y - tree_view->allocation.height + 1);
 	  gtk_adjustment_set_value (adj, CLAMP (value, 0.0, adj->upper - adj->page_size));
 	}
     }