diff --git a/ChangeLog b/ChangeLog
index 95b281fcd4..36059bed59 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
+2006-07-02  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtktreemodelsort.c (gtk_tree_model_sort_finalize): 
+	Don't leak default_sort_data.  (#346341, Christian Weiske)
+
 2006-06-29  Matthias Clasen  <mclasen@redhat.com>
 
+	* NEWS: Updates
+
 	* gdk/x11/gdkevents-x11.c (gdk_event_translate): Update the
 	size of the drawable for the root window when the screen size
 	changes.  (#346102, Sven Herzberg)
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 95b281fcd4..36059bed59 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,12 @@
+2006-07-02  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtktreemodelsort.c (gtk_tree_model_sort_finalize): 
+	Don't leak default_sort_data.  (#346341, Christian Weiske)
+
 2006-06-29  Matthias Clasen  <mclasen@redhat.com>
 
+	* NEWS: Updates
+
 	* gdk/x11/gdkevents-x11.c (gdk_event_translate): Update the
 	size of the drawable for the root window when the screen size
 	changes.  (#346102, Sven Herzberg)
diff --git a/gtk/gtktreemodelsort.c b/gtk/gtktreemodelsort.c
index ed15794217..48e42597a8 100644
--- a/gtk/gtktreemodelsort.c
+++ b/gtk/gtktreemodelsort.c
@@ -410,6 +410,13 @@ gtk_tree_model_sort_finalize (GObject *object)
       tree_model_sort->sort_list = NULL;
     }
 
+  if (tree_model_sort->default_sort_destroy)
+    {
+      tree_model_sort->default_sort_destroy (tree_model_sort->default_sort_data);
+      tree_model_sort->default_sort_destroy = NULL;
+      tree_model_sort->default_sort_data = NULL;
+    }
+
   /* must chain up */
   parent_class->finalize (object);
 }