diff --git a/ChangeLog b/ChangeLog
index f085c12dc..3043b4260 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,12 @@
 WeeChat - Wee Enhanced Environment for Chat
 ===========================================
 
-ChangeLog - 2007-08-21
+ChangeLog - 2007-08-23
 
 
 Version 0.2.6 (under dev!):
+   * fixed user modes in nicklist when ban and nick mode are received in the
+     same MODE message (bug #20870)
    * fixed IRC message 333: silently ignore message if error when parsing it
    * fixed server option "command_delay": does not freeze WeeChat any more
    * added paste detection, new options look_paste_max_lines and
diff --git a/src/irc/irc-mode.c b/src/irc/irc-mode.c
index 6b12bb9b5..246f618b3 100644
--- a/src/irc/irc-mode.c
+++ b/src/irc/irc-mode.c
@@ -126,6 +126,10 @@ irc_mode_channel_set (t_irc_server *server, t_irc_channel *channel,
                                 irc_mode_channel_set_nick (channel, ptr_arg,
                                                            set_flag, IRC_NICK_CHANADMIN);
                             break;
+                        case 'b': /* ban (ignored) */
+                            ptr_arg = ((argc > 0) && (current_arg >= 0)) ?
+                                argv[current_arg--] : NULL;
+                            break;
                         case 'h': /* half-op */
                             ptr_arg = ((argc > 0) && (current_arg >= 0)) ?
                                 argv[current_arg--] : NULL;
diff --git a/weechat/ChangeLog b/weechat/ChangeLog
index f085c12dc..3043b4260 100644
--- a/weechat/ChangeLog
+++ b/weechat/ChangeLog
@@ -1,10 +1,12 @@
 WeeChat - Wee Enhanced Environment for Chat
 ===========================================
 
-ChangeLog - 2007-08-21
+ChangeLog - 2007-08-23
 
 
 Version 0.2.6 (under dev!):
+   * fixed user modes in nicklist when ban and nick mode are received in the
+     same MODE message (bug #20870)
    * fixed IRC message 333: silently ignore message if error when parsing it
    * fixed server option "command_delay": does not freeze WeeChat any more
    * added paste detection, new options look_paste_max_lines and
diff --git a/weechat/src/irc/irc-mode.c b/weechat/src/irc/irc-mode.c
index 6b12bb9b5..246f618b3 100644
--- a/weechat/src/irc/irc-mode.c
+++ b/weechat/src/irc/irc-mode.c
@@ -126,6 +126,10 @@ irc_mode_channel_set (t_irc_server *server, t_irc_channel *channel,
                                 irc_mode_channel_set_nick (channel, ptr_arg,
                                                            set_flag, IRC_NICK_CHANADMIN);
                             break;
+                        case 'b': /* ban (ignored) */
+                            ptr_arg = ((argc > 0) && (current_arg >= 0)) ?
+                                argv[current_arg--] : NULL;
+                            break;
                         case 'h': /* half-op */
                             ptr_arg = ((argc > 0) && (current_arg >= 0)) ?
                                 argv[current_arg--] : NULL;