diff --git a/ChangeLog b/ChangeLog
index 329dee242..20b0e4713 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,7 @@ v0.3.7-rc2, 2012-02-19
 Version 0.3.7 (under dev!)
 --------------------------
 
+* core: fix memory leak when closing buffer
 * core: fix memory leak in function util_search_full_lib_name
 * core: automatically add newline char after last pasted line (when pasting many
   lines with confirmation) (task #10703)
diff --git a/src/gui/gui-buffer.c b/src/gui/gui-buffer.c
index 0a95598a6..8a06a8223 100644
--- a/src/gui/gui-buffer.c
+++ b/src/gui/gui-buffer.c
@@ -2185,12 +2185,16 @@ gui_buffer_close (struct t_gui_buffer *buffer)
         free (buffer->mixed_lines);
 
     /* free some data */
-    if (buffer->title)
-        free (buffer->title);
+    if (buffer->plugin_name_for_upgrade)
+        free (buffer->plugin_name_for_upgrade);
     if (buffer->name)
         free (buffer->name);
+    if (buffer->full_name)
+        free (buffer->full_name);
     if (buffer->short_name)
         free (buffer->short_name);
+    if (buffer->title)
+        free (buffer->title);
     if (buffer->input_buffer)
         free (buffer->input_buffer);
     gui_buffer_undo_free_all (buffer);