diff --git a/ChangeLog b/ChangeLog
index 9faf21721..83756e27a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,7 @@ ChangeLog - 2006-08-26
 
 	
 Version 0.2.1 (under dev!):
+   * fixed bug with auto-rejoin of keyed chans (bug #17534)
    * added default nick completion when line starts with '//' (bug #17535)
    * values yes/no accepted (as on/off) for config boolean values (task #5454)
    * added server default notify level (set by /buffer notify on server buffer)
diff --git a/src/irc/irc-recv.c b/src/irc/irc-recv.c
index 7c9c4a9ea..7de6aa4e8 100644
--- a/src/irc/irc-recv.c
+++ b/src/irc/irc-recv.c
@@ -3361,6 +3361,7 @@ irc_cmd_recv_324 (t_irc_server *server, char *host, char *nick, char *arguments)
                     else
                         ptr_channel->modes = (char *) malloc (strlen (pos_modes) + 1);
                     strcpy (ptr_channel->modes, pos_modes);
+                    irc_mode_channel_set (ptr_channel, pos_modes);
                 }
                 else
                 {
diff --git a/weechat/ChangeLog b/weechat/ChangeLog
index 9faf21721..83756e27a 100644
--- a/weechat/ChangeLog
+++ b/weechat/ChangeLog
@@ -5,6 +5,7 @@ ChangeLog - 2006-08-26
 
 	
 Version 0.2.1 (under dev!):
+   * fixed bug with auto-rejoin of keyed chans (bug #17534)
    * added default nick completion when line starts with '//' (bug #17535)
    * values yes/no accepted (as on/off) for config boolean values (task #5454)
    * added server default notify level (set by /buffer notify on server buffer)
diff --git a/weechat/src/irc/irc-recv.c b/weechat/src/irc/irc-recv.c
index 7c9c4a9ea..7de6aa4e8 100644
--- a/weechat/src/irc/irc-recv.c
+++ b/weechat/src/irc/irc-recv.c
@@ -3361,6 +3361,7 @@ irc_cmd_recv_324 (t_irc_server *server, char *host, char *nick, char *arguments)
                     else
                         ptr_channel->modes = (char *) malloc (strlen (pos_modes) + 1);
                     strcpy (ptr_channel->modes, pos_modes);
+                    irc_mode_channel_set (ptr_channel, pos_modes);
                 }
                 else
                 {