diff --git a/ChangeLog b/ChangeLog
index c655c38425..ee961926bf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-01-10  Kristian Rietveld  <kris@imendio.com>
+
+	Merge from trunk:
+
+	* gtk/gtktreemodelfilter.c (gtk_tree_model_filter_get_path): Fix
+	a leak of the path (#504611, patch from Sadrul Habib Chowdhury).
+
 2008-01-10  Kristian Rietveld  <kris@imendio.com>
 
 	Merge from trunk (omitted unit test updates):
diff --git a/gtk/gtktreemodelfilter.c b/gtk/gtktreemodelfilter.c
index acf5d5b814..4c32f9ffea 100644
--- a/gtk/gtktreemodelfilter.c
+++ b/gtk/gtktreemodelfilter.c
@@ -2216,13 +2216,14 @@ gtk_tree_model_filter_get_path (GtkTreeModel *model,
   g_return_val_if_fail (GTK_TREE_MODEL_FILTER (model)->priv->child_model != NULL, NULL);
   g_return_val_if_fail (GTK_TREE_MODEL_FILTER (model)->priv->stamp == iter->stamp, NULL);
 
-  retval = gtk_tree_path_new ();
   level = iter->user_data;
   elt = iter->user_data2;
 
   if (!elt->visible)
     return NULL;
 
+  retval = gtk_tree_path_new ();
+
   while (level)
     {
       int i = 0, index = 0;