diff --git a/ChangeLog b/ChangeLog
index baf8688ec0..23b1b708c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-07  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* gtk/gtkfilechooserbutton.c: (update_label_and_image):
+	Merge leak fix from stable. Bug 306754.
+
 2005-06-05  Tor Lillqvist  <tml@novell.com>
 
 	* gdk/win32/gdkscreen-win32.c
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index baf8688ec0..23b1b708c5 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2005-06-07  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* gtk/gtkfilechooserbutton.c: (update_label_and_image):
+	Merge leak fix from stable. Bug 306754.
+
 2005-06-05  Tor Lillqvist  <tml@novell.com>
 
 	* gdk/win32/gdkscreen-win32.c
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index baf8688ec0..23b1b708c5 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2005-06-07  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* gtk/gtkfilechooserbutton.c: (update_label_and_image):
+	Merge leak fix from stable. Bug 306754.
+
 2005-06-05  Tor Lillqvist  <tml@novell.com>
 
 	* gdk/win32/gdkscreen-win32.c
diff --git a/gtk/gtkfilechooserbutton.c b/gtk/gtkfilechooserbutton.c
index 3c38073db0..1b443462ec 100644
--- a/gtk/gtkfilechooserbutton.c
+++ b/gtk/gtkfilechooserbutton.c
@@ -1828,6 +1828,8 @@ update_label_and_image (GtkFileChooserButton *button)
       folder = gtk_file_system_get_folder (priv->fs,
 					   parent_path ? parent_path : path,
 					   GTK_FILE_INFO_DISPLAY_NAME, NULL);
+      gtk_file_path_free (parent_path);
+
       if (folder)
 	{
 	  GtkFileInfo *info;