diff --git a/ChangeLog b/ChangeLog
index 160d39f76..5ad549ce1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,12 +1,13 @@
 WeeChat ChangeLog
 =================
 Sébastien Helleu <flashcode@flashtux.org>
-v0.3.6-dev, 2011-08-21
+v0.3.6-dev, 2011-08-25
 
 
 Version 0.3.6 (under dev!)
 --------------------------
 
+* core: fix memory leak in display of empty bar items
 * core: fix input of wide UTF-8 chars under Cygwin (bug #34061)
 * core: allow name of buffer for command /buffer clear (task #11269)
 * core: add new command /repeat (execute a command several times)
diff --git a/src/gui/gui-bar-item.c b/src/gui/gui-bar-item.c
index 3364aed00..425a18b53 100644
--- a/src/gui/gui-bar-item.c
+++ b/src/gui/gui-bar-item.c
@@ -309,7 +309,12 @@ gui_bar_item_get_value (struct t_gui_bar *bar, struct t_gui_window *window,
             item_value = (ptr_item->build_callback) (ptr_item->build_callback_data,
                                                      ptr_item, window);
         }
-        if (!item_value || !item_value[0])
+        if (item_value && !item_value[0])
+        {
+            free (item_value);
+            item_value = NULL;
+        }
+        if (!item_value)
             return NULL;
     }