diff --git a/ChangeLog b/ChangeLog
index 317e9f7380..41b5f6a409 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Sun Aug 22 16:09:49 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+	* gtk/gtkliststore.h (struct _GtkListStore): 
+	* gtk/gtkliststore.c (gtk_list_store_init): 
+	* gtk/gtkliststore.c (gtk_list_store_insert): 
+	* gtk/gtkliststore.c (gtk_list_store_remove): 
+	Restore length field; PyGTK and maybe others use it directly.
+
 Sun Aug 22 15:46:56 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
 
 	* gtk/gtkpaned.c (gtk_paned_class_init):
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 317e9f7380..41b5f6a409 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+Sun Aug 22 16:09:49 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+	* gtk/gtkliststore.h (struct _GtkListStore): 
+	* gtk/gtkliststore.c (gtk_list_store_init): 
+	* gtk/gtkliststore.c (gtk_list_store_insert): 
+	* gtk/gtkliststore.c (gtk_list_store_remove): 
+	Restore length field; PyGTK and maybe others use it directly.
+
 Sun Aug 22 15:46:56 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
 
 	* gtk/gtkpaned.c (gtk_paned_class_init):
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 317e9f7380..41b5f6a409 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,11 @@
+Sun Aug 22 16:09:49 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+	* gtk/gtkliststore.h (struct _GtkListStore): 
+	* gtk/gtkliststore.c (gtk_list_store_init): 
+	* gtk/gtkliststore.c (gtk_list_store_insert): 
+	* gtk/gtkliststore.c (gtk_list_store_remove): 
+	Restore length field; PyGTK and maybe others use it directly.
+
 Sun Aug 22 15:46:56 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
 
 	* gtk/gtkpaned.c (gtk_paned_class_init):
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 317e9f7380..41b5f6a409 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+Sun Aug 22 16:09:49 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+	* gtk/gtkliststore.h (struct _GtkListStore): 
+	* gtk/gtkliststore.c (gtk_list_store_init): 
+	* gtk/gtkliststore.c (gtk_list_store_insert): 
+	* gtk/gtkliststore.c (gtk_list_store_remove): 
+	Restore length field; PyGTK and maybe others use it directly.
+
 Sun Aug 22 15:46:56 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
 
 	* gtk/gtkpaned.c (gtk_paned_class_init):
diff --git a/gtk/gtkliststore.c b/gtk/gtkliststore.c
index 3a8c8e0e10..df29412c7a 100644
--- a/gtk/gtkliststore.c
+++ b/gtk/gtkliststore.c
@@ -245,6 +245,7 @@ gtk_list_store_init (GtkListStore *list_store)
   list_store->stamp = g_random_int ();
   list_store->sort_column_id = -2;
   list_store->columns_dirty = FALSE;
+  list_store->length = 0;
 }
 
 /**
@@ -932,6 +933,8 @@ gtk_list_store_remove (GtkListStore *list_store,
   
   _gtk_tree_data_list_free (_gtk_sequence_ptr_get_data (ptr), list_store->column_headers);
   _gtk_sequence_remove (iter->user_data);
+
+  list_store->length--;
   
   gtk_tree_model_row_deleted (GTK_TREE_MODEL (list_store), path);
   gtk_tree_path_free (path);
@@ -992,6 +995,8 @@ gtk_list_store_insert (GtkListStore *list_store,
 
   g_assert (VALID_ITER (iter, list_store));
 
+  list_store->length++;
+  
   path = gtk_tree_path_new ();
   gtk_tree_path_append_index (path, position);
   gtk_tree_model_row_inserted (GTK_TREE_MODEL (list_store), path, iter);