diff --git a/ChangeLog b/ChangeLog
index a979052e59..e0d6c2e8f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Aug 22 12:04:59 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+	* gtk/gtkliststore.c (gtk_list_store_sort_iter_changed): Use the
+	correct tree path (#150289, Morten Welinder).
+
 Sun Aug 22 00:08:44 2004  Matthias Clasen  <maclas@gmx.de>
 
 	Fix #150406, reported by Fernando San Martín Woerner, patch
@@ -1521,6 +1526,7 @@ Mon Jul 12 00:52:04 2004  Matthias Clasen  <maclas@gmx.de>
 	items.  (#102530, #68015, #109811, Jordi Mallach, Benjamin Otte,
 	Michael Opdenacker)
 
+>>>>>>> 1.5542
 Sun Jul 11 15:24:03 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
 
 	Bug 143330, support update counter spec.
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index a979052e59..e0d6c2e8f2 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Sun Aug 22 12:04:59 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+	* gtk/gtkliststore.c (gtk_list_store_sort_iter_changed): Use the
+	correct tree path (#150289, Morten Welinder).
+
 Sun Aug 22 00:08:44 2004  Matthias Clasen  <maclas@gmx.de>
 
 	Fix #150406, reported by Fernando San Martín Woerner, patch
@@ -1521,6 +1526,7 @@ Mon Jul 12 00:52:04 2004  Matthias Clasen  <maclas@gmx.de>
 	items.  (#102530, #68015, #109811, Jordi Mallach, Benjamin Otte,
 	Michael Opdenacker)
 
+>>>>>>> 1.5542
 Sun Jul 11 15:24:03 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
 
 	Bug 143330, support update counter spec.
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index a979052e59..e0d6c2e8f2 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Sun Aug 22 12:04:59 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+	* gtk/gtkliststore.c (gtk_list_store_sort_iter_changed): Use the
+	correct tree path (#150289, Morten Welinder).
+
 Sun Aug 22 00:08:44 2004  Matthias Clasen  <maclas@gmx.de>
 
 	Fix #150406, reported by Fernando San Martín Woerner, patch
@@ -1521,6 +1526,7 @@ Mon Jul 12 00:52:04 2004  Matthias Clasen  <maclas@gmx.de>
 	items.  (#102530, #68015, #109811, Jordi Mallach, Benjamin Otte,
 	Michael Opdenacker)
 
+>>>>>>> 1.5542
 Sun Jul 11 15:24:03 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
 
 	Bug 143330, support update counter spec.
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index a979052e59..e0d6c2e8f2 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Sun Aug 22 12:04:59 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+	* gtk/gtkliststore.c (gtk_list_store_sort_iter_changed): Use the
+	correct tree path (#150289, Morten Welinder).
+
 Sun Aug 22 00:08:44 2004  Matthias Clasen  <maclas@gmx.de>
 
 	Fix #150406, reported by Fernando San Martín Woerner, patch
@@ -1521,6 +1526,7 @@ Mon Jul 12 00:52:04 2004  Matthias Clasen  <maclas@gmx.de>
 	items.  (#102530, #68015, #109811, Jordi Mallach, Benjamin Otte,
 	Michael Opdenacker)
 
+>>>>>>> 1.5542
 Sun Jul 11 15:24:03 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
 
 	Bug 143330, support update counter spec.
diff --git a/gtk/gtkliststore.c b/gtk/gtkliststore.c
index 24ca369f53..95700acc9a 100644
--- a/gtk/gtkliststore.c
+++ b/gtk/gtkliststore.c
@@ -1669,7 +1669,7 @@ gtk_list_store_sort_iter_changed (GtkListStore *list_store,
 			      gtk_list_store_compare_func,
 			      list_store);
 
-  tmp_path = gtk_tree_path_new ();
+  tmp_path = gtk_tree_model_get_path (GTK_TREE_MODEL (list_store), iter);
   gtk_tree_model_row_changed (GTK_TREE_MODEL (list_store), tmp_path, iter);
   gtk_tree_path_free (tmp_path);
 }