diff --git a/ChangeLog b/ChangeLog
index 79d323a2d..6b2c4278c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,11 @@
 WeeChat - Wee Enhanced Environment for Chat
 ===========================================
 
-ChangeLog - 2006-09-16
+ChangeLog - 2006-09-23
 
 
 Version 0.2.1 (under dev!):
+   * fixed random crash with /upgrade command (error when loading buffers)
    * fixed buffer search by server/channel: now if only channel is specified,
      a channel of another server can be found
    * fixed highlight for DCC, invite and notice: when a window is displaying
diff --git a/src/irc/irc-channel.c b/src/irc/irc-channel.c
index 902a06ed3..482352c56 100644
--- a/src/irc/irc-channel.c
+++ b/src/irc/irc-channel.c
@@ -72,7 +72,8 @@ channel_new (t_irc_server *server, int channel_type, char *channel_name)
     new_channel->display_creation_date = 0;
     new_channel->nicks = NULL;
     new_channel->last_nick = NULL;
-
+    new_channel->buffer = NULL;
+    
     /* add new channel to queue */
     new_channel->prev_channel = server->last_channel;
     new_channel->next_channel = NULL;
diff --git a/weechat/ChangeLog b/weechat/ChangeLog
index 79d323a2d..6b2c4278c 100644
--- a/weechat/ChangeLog
+++ b/weechat/ChangeLog
@@ -1,10 +1,11 @@
 WeeChat - Wee Enhanced Environment for Chat
 ===========================================
 
-ChangeLog - 2006-09-16
+ChangeLog - 2006-09-23
 
 
 Version 0.2.1 (under dev!):
+   * fixed random crash with /upgrade command (error when loading buffers)
    * fixed buffer search by server/channel: now if only channel is specified,
      a channel of another server can be found
    * fixed highlight for DCC, invite and notice: when a window is displaying
diff --git a/weechat/src/irc/irc-channel.c b/weechat/src/irc/irc-channel.c
index 902a06ed3..482352c56 100644
--- a/weechat/src/irc/irc-channel.c
+++ b/weechat/src/irc/irc-channel.c
@@ -72,7 +72,8 @@ channel_new (t_irc_server *server, int channel_type, char *channel_name)
     new_channel->display_creation_date = 0;
     new_channel->nicks = NULL;
     new_channel->last_nick = NULL;
-
+    new_channel->buffer = NULL;
+    
     /* add new channel to queue */
     new_channel->prev_channel = server->last_channel;
     new_channel->next_channel = NULL;