diff --git a/ChangeLog b/ChangeLog
index e80c35073..969b9a032 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,13 @@
 WeeChat ChangeLog
 =================
 FlashCode <flashcode@flashtux.org>
-v0.3.3-dev, 2010-04-18
+v0.3.3-dev, 2010-04-20
 
 
+Version 0.3.3 (under dev!)
+--------------------------
+* irc: set buffer local variable "away" when opening new channel (bug #29618)
+
 Version 0.3.2 (2010-04-18)
 --------------------------
 
diff --git a/src/plugins/irc/irc-channel.c b/src/plugins/irc/irc-channel.c
index 5b3fdaa22..dfb6e0674 100644
--- a/src/plugins/irc/irc-channel.c
+++ b/src/plugins/irc/irc-channel.c
@@ -195,6 +195,8 @@ irc_channel_new (struct t_irc_server *server, int channel_type,
         weechat_buffer_set (new_buffer, "localvar_set_nick", server->nick);
         weechat_buffer_set (new_buffer, "localvar_set_server", server->name);
         weechat_buffer_set (new_buffer, "localvar_set_channel", channel_name);
+        if (server->is_away && server->away_message)
+            weechat_buffer_set (new_buffer, "localvar_set_away", server->away_message);
         weechat_hook_signal_send ("logger_backlog",
                                   WEECHAT_HOOK_SIGNAL_POINTER, new_buffer);
         if (weechat_config_boolean (irc_config_network_send_unknown_commands))