diff --git a/ChangeLog b/ChangeLog
index 3d5a68097..8bc835cf4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,12 @@
 WeeChat - Wee Enhanced Environment for Chat
 ===========================================
 
-ChangeLog - 2006-12-05
+ChangeLog - 2006-12-08
 
 
 Version 0.2.2 (under dev!):
+   * fixed bug with nick completion in command args (now uses option
+     look_nick_completion_ignore)
    * fixed display bug with color for first line on screen (bug #17719)
    * added anti-flood option (irc_anti_flood) (task #5442)
    * fixed bug with "set_config" function in plugins API (bug #18448)
diff --git a/src/common/completion.c b/src/common/completion.c
index e5298b0ab..82abf7a2e 100644
--- a/src/common/completion.c
+++ b/src/common/completion.c
@@ -868,6 +868,7 @@ completion_build_list_template (t_completion *completion, char *template)
                             break;
                         case 'n': /* channel nicks */
                             completion_list_add_channel_nicks (completion);
+                            completion->context = COMPLETION_NICK;
                             break;
                         case 'N': /* channel nicks and hosts */
                             completion_list_add_channel_nicks_hosts (completion);
diff --git a/weechat/ChangeLog b/weechat/ChangeLog
index 3d5a68097..8bc835cf4 100644
--- a/weechat/ChangeLog
+++ b/weechat/ChangeLog
@@ -1,10 +1,12 @@
 WeeChat - Wee Enhanced Environment for Chat
 ===========================================
 
-ChangeLog - 2006-12-05
+ChangeLog - 2006-12-08
 
 
 Version 0.2.2 (under dev!):
+   * fixed bug with nick completion in command args (now uses option
+     look_nick_completion_ignore)
    * fixed display bug with color for first line on screen (bug #17719)
    * added anti-flood option (irc_anti_flood) (task #5442)
    * fixed bug with "set_config" function in plugins API (bug #18448)
diff --git a/weechat/src/common/completion.c b/weechat/src/common/completion.c
index e5298b0ab..82abf7a2e 100644
--- a/weechat/src/common/completion.c
+++ b/weechat/src/common/completion.c
@@ -868,6 +868,7 @@ completion_build_list_template (t_completion *completion, char *template)
                             break;
                         case 'n': /* channel nicks */
                             completion_list_add_channel_nicks (completion);
+                            completion->context = COMPLETION_NICK;
                             break;
                         case 'N': /* channel nicks and hosts */
                             completion_list_add_channel_nicks_hosts (completion);