diff --git a/src/plugins/irc/irc-protocol.c b/src/plugins/irc/irc-protocol.c
index aacb44f4f..a740d253f 100644
--- a/src/plugins/irc/irc-protocol.c
+++ b/src/plugins/irc/irc-protocol.c
@@ -484,8 +484,8 @@ IRC_PROTOCOL_CALLBACK(authenticate)
  * "away-notify").
  *
  * Command looks like:
- *   :nick!user@host AWAY
- *   :nick!user@host AWAY :I am away
+ *   AWAY
+ *   AWAY :I am away
  */
 
 IRC_PROTOCOL_CALLBACK(away)
@@ -493,14 +493,17 @@ IRC_PROTOCOL_CALLBACK(away)
     struct t_irc_channel *ptr_channel;
     struct t_irc_nick *ptr_nick;
 
-    IRC_PROTOCOL_MIN_ARGS(2);
+    IRC_PROTOCOL_MIN_PARAMS(0);
 
     for (ptr_channel = server->channels; ptr_channel;
          ptr_channel = ptr_channel->next_channel)
     {
         ptr_nick = irc_nick_search (server, ptr_channel, nick);
         if (ptr_nick)
-            irc_nick_set_away (server, ptr_channel, ptr_nick, (argc > 2));
+        {
+            irc_nick_set_away (server, ptr_channel, ptr_nick,
+                               (num_params > 0));
+        }
     }
 
     return WEECHAT_RC_OK;