diff --git a/gio/ChangeLog b/gio/ChangeLog
index a323f5d9b..d5829bc81 100644
--- a/gio/ChangeLog
+++ b/gio/ChangeLog
@@ -1,3 +1,12 @@
+2008-07-19  Matthias Clasen  <mclasen@redhat.com>
+
+	Merge from trunk:
+
+	Bug 540616 – mem leak in filechooser button
+
+	* gunixvolumemonitor.c (get_mount_for_mount_path): Free
+	the mount entry. Reported by Chrisitan Persch
+
 2008-07-01  Matthias Clasen  <mclasen@redhat.com>
 	
 	* === Released 2.16.4 ===
diff --git a/gio/gunixvolumemonitor.c b/gio/gunixvolumemonitor.c
index fcd90fb79..cd6a20075 100644
--- a/gio/gunixvolumemonitor.c
+++ b/gio/gunixvolumemonitor.c
@@ -153,6 +153,8 @@ get_mount_for_mount_path (const char *mount_path,
   /* TODO: Set mountable volume? */
   mount = _g_unix_mount_new (NULL, mount_entry, NULL);
 
+  g_unix_mount_free (mount_entry);
+
   return G_MOUNT (mount);
 }