diff --git a/ChangeLog b/ChangeLog
index 045a2e877..dbe8a75f5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,11 @@
 WeeChat - Wee Enhanced Environment for Chat
 ===========================================
 
-ChangeLog - 2006-11-19
+ChangeLog - 2006-11-26
 
 
 Version 0.2.2 (under dev!):
+   * fixed memleak in keyboard input
    * fixed refresh bug when changing config options if window is splited
    * added space between chat and nicklist when position is "right" (bug #17852)
    * added option "look_nicklist_separator" (task #5437)
diff --git a/src/gui/curses/gui-curses-keyboard.c b/src/gui/curses/gui-curses-keyboard.c
index 373ec90e3..309de77af 100644
--- a/src/gui/curses/gui-curses-keyboard.c
+++ b/src/gui/curses/gui-curses-keyboard.c
@@ -322,6 +322,8 @@ gui_keyboard_read ()
                                                          buffer_before_key,
                                                          gui_current_window->buffer->input_buffer);
 #endif
+                    if (buffer_before_key)
+                        free (buffer_before_key);
                     break;
                 case BUFFER_TYPE_DCC:
                     gui_exec_action_dcc (gui_current_window, key_str);
diff --git a/weechat/ChangeLog b/weechat/ChangeLog
index 045a2e877..dbe8a75f5 100644
--- a/weechat/ChangeLog
+++ b/weechat/ChangeLog
@@ -1,10 +1,11 @@
 WeeChat - Wee Enhanced Environment for Chat
 ===========================================
 
-ChangeLog - 2006-11-19
+ChangeLog - 2006-11-26
 
 
 Version 0.2.2 (under dev!):
+   * fixed memleak in keyboard input
    * fixed refresh bug when changing config options if window is splited
    * added space between chat and nicklist when position is "right" (bug #17852)
    * added option "look_nicklist_separator" (task #5437)
diff --git a/weechat/src/gui/curses/gui-curses-keyboard.c b/weechat/src/gui/curses/gui-curses-keyboard.c
index 373ec90e3..309de77af 100644
--- a/weechat/src/gui/curses/gui-curses-keyboard.c
+++ b/weechat/src/gui/curses/gui-curses-keyboard.c
@@ -322,6 +322,8 @@ gui_keyboard_read ()
                                                          buffer_before_key,
                                                          gui_current_window->buffer->input_buffer);
 #endif
+                    if (buffer_before_key)
+                        free (buffer_before_key);
                     break;
                 case BUFFER_TYPE_DCC:
                     gui_exec_action_dcc (gui_current_window, key_str);