diff --git a/ChangeLog b/ChangeLog
index 5a3535343..921dd8b4a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,11 @@ WeeChat - Wee Enhanced Environment for Chat
 
 ChangeLog - 2006-08-19
 
+	
+Version 0.2.1 (under dev!):
+   * fixed nick refresh problem with unrealircd specific modes: chan owner (~)
+     and chan admin (&) (bug #17340)
+	
 Version 0.2.0 (2006-08-19):
    * added 'C'lear option on IRC raw buffer
    * IRC raw buffer now uses join/part prefix with color to display messages
diff --git a/src/irc/irc-mode.c b/src/irc/irc-mode.c
index 9336cb802..d899cc72d 100644
--- a/src/irc/irc-mode.c
+++ b/src/irc/irc-mode.c
@@ -121,6 +121,10 @@ irc_mode_channel_set (t_irc_channel *channel, char *modes)
                         argv[current_arg--] : NULL;
                     switch (pos[0])
                     {
+                        case 'a': /* unrealircd specific flag */
+                            irc_mode_channel_set_nick (channel, ptr_arg,
+                                                       set_flag, NICK_CHANADMIN);
+                            break;
                         case 'h':
                             irc_mode_channel_set_nick (channel, ptr_arg,
                                                        set_flag, NICK_HALFOP);
@@ -144,6 +148,10 @@ irc_mode_channel_set (t_irc_channel *channel, char *modes)
                             irc_mode_channel_set_nick (channel, ptr_arg,
                                                        set_flag, NICK_OP);
                             break;
+                        case 'q': /* unrealircd specific flag */
+                            irc_mode_channel_set_nick (channel, ptr_arg,
+                                                       set_flag, NICK_CHANOWNER);
+                            break;
                         case 'v':
                             irc_mode_channel_set_nick (channel, ptr_arg,
                                                        set_flag, NICK_VOICE);
diff --git a/weechat/ChangeLog b/weechat/ChangeLog
index 5a3535343..921dd8b4a 100644
--- a/weechat/ChangeLog
+++ b/weechat/ChangeLog
@@ -3,6 +3,11 @@ WeeChat - Wee Enhanced Environment for Chat
 
 ChangeLog - 2006-08-19
 
+	
+Version 0.2.1 (under dev!):
+   * fixed nick refresh problem with unrealircd specific modes: chan owner (~)
+     and chan admin (&) (bug #17340)
+	
 Version 0.2.0 (2006-08-19):
    * added 'C'lear option on IRC raw buffer
    * IRC raw buffer now uses join/part prefix with color to display messages
diff --git a/weechat/src/irc/irc-mode.c b/weechat/src/irc/irc-mode.c
index 9336cb802..d899cc72d 100644
--- a/weechat/src/irc/irc-mode.c
+++ b/weechat/src/irc/irc-mode.c
@@ -121,6 +121,10 @@ irc_mode_channel_set (t_irc_channel *channel, char *modes)
                         argv[current_arg--] : NULL;
                     switch (pos[0])
                     {
+                        case 'a': /* unrealircd specific flag */
+                            irc_mode_channel_set_nick (channel, ptr_arg,
+                                                       set_flag, NICK_CHANADMIN);
+                            break;
                         case 'h':
                             irc_mode_channel_set_nick (channel, ptr_arg,
                                                        set_flag, NICK_HALFOP);
@@ -144,6 +148,10 @@ irc_mode_channel_set (t_irc_channel *channel, char *modes)
                             irc_mode_channel_set_nick (channel, ptr_arg,
                                                        set_flag, NICK_OP);
                             break;
+                        case 'q': /* unrealircd specific flag */
+                            irc_mode_channel_set_nick (channel, ptr_arg,
+                                                       set_flag, NICK_CHANOWNER);
+                            break;
                         case 'v':
                             irc_mode_channel_set_nick (channel, ptr_arg,
                                                        set_flag, NICK_VOICE);