diff --git a/gio/ChangeLog b/gio/ChangeLog
index d33e3c167..61e9f3326 100644
--- a/gio/ChangeLog
+++ b/gio/ChangeLog
@@ -1,3 +1,10 @@
+2008-07-16  Matthias Clasen  <mclasen@redhat.com>
+
+	Bug 540616 – mem leak in filechooser button
+
+	* gunixvolumemonitor.c (get_mount_for_mount_path): Free
+	the mount entry. Reported by Chrisitan Persch
+
 2008-07-16  Matthias Clasen  <mclasen@redhat.com>
 
 	* gfile.c: Small documentation fixes.
diff --git a/gio/gunixvolumemonitor.c b/gio/gunixvolumemonitor.c
index d617f8d00..cbf5b8345 100644
--- a/gio/gunixvolumemonitor.c
+++ b/gio/gunixvolumemonitor.c
@@ -154,6 +154,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);
 }