diff --git a/ChangeLog b/ChangeLog
index fbf7ca02e..0f79665f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,10 @@
 WeeChat - Wee Enhanced Environment for Chat
 ===========================================
 
-ChangeLog - 2006-05-21
+ChangeLog - 2006-05-24
 
 Version 0.1.9 (under dev!):
+   * fixed /squery command (message sent to server, now ok with # args > 2)
    * fixed /alias command (with an alias name, display content)
    * improved lua plugin detection (bug #16574)
    * added backtrace when WeeChat crashes, log file automatically renamed
diff --git a/src/irc/irc-commands.c b/src/irc/irc-commands.c
index 1408364d0..2f3769f88 100644
--- a/src/irc/irc-commands.c
+++ b/src/irc/irc-commands.c
@@ -233,7 +233,7 @@ t_irc_command irc_commands[] =
   { "squery", N_("deliver a message to a service"),
     N_("service text"),
     N_("service: name of service\ntext: text to send"),
-    NULL, 2, 2, 1, 1, NULL, irc_cmd_send_squery, NULL },
+    NULL, 2, MAX_ARGS, 1, 1, NULL, irc_cmd_send_squery, NULL },
   { "squit", N_("disconnect server links"),
     N_("server comment"),
     N_( "server: server name\n"
diff --git a/src/irc/irc-send.c b/src/irc/irc-send.c
index b54346eb6..6aba63a95 100644
--- a/src/irc/irc-send.c
+++ b/src/irc/irc-send.c
@@ -1807,10 +1807,25 @@ int
 irc_cmd_send_squery (t_irc_server *server, t_irc_channel *channel,
                      char *arguments)
 {
+    char *pos;
+    
     /* make gcc happy */
     (void) channel;
+
+    pos = strchr (arguments, ' ');
+    if (pos)
+    {
+        pos[0] = '\0';
+        pos++;
+        while (pos[0] == ' ')
+        {
+            pos++;
+        }
+        server_sendf (server, "SQUERY %s :%s\r\n", arguments, pos);
+    }
+    else
+        server_sendf (server, "SQUERY %s\r\n", arguments);
     
-    server_sendf (server, "SQUERY %s\r\n", arguments);
     return 0;
 }
 
diff --git a/weechat/ChangeLog b/weechat/ChangeLog
index fbf7ca02e..0f79665f1 100644
--- a/weechat/ChangeLog
+++ b/weechat/ChangeLog
@@ -1,9 +1,10 @@
 WeeChat - Wee Enhanced Environment for Chat
 ===========================================
 
-ChangeLog - 2006-05-21
+ChangeLog - 2006-05-24
 
 Version 0.1.9 (under dev!):
+   * fixed /squery command (message sent to server, now ok with # args > 2)
    * fixed /alias command (with an alias name, display content)
    * improved lua plugin detection (bug #16574)
    * added backtrace when WeeChat crashes, log file automatically renamed
diff --git a/weechat/src/irc/irc-commands.c b/weechat/src/irc/irc-commands.c
index 1408364d0..2f3769f88 100644
--- a/weechat/src/irc/irc-commands.c
+++ b/weechat/src/irc/irc-commands.c
@@ -233,7 +233,7 @@ t_irc_command irc_commands[] =
   { "squery", N_("deliver a message to a service"),
     N_("service text"),
     N_("service: name of service\ntext: text to send"),
-    NULL, 2, 2, 1, 1, NULL, irc_cmd_send_squery, NULL },
+    NULL, 2, MAX_ARGS, 1, 1, NULL, irc_cmd_send_squery, NULL },
   { "squit", N_("disconnect server links"),
     N_("server comment"),
     N_( "server: server name\n"
diff --git a/weechat/src/irc/irc-send.c b/weechat/src/irc/irc-send.c
index b54346eb6..6aba63a95 100644
--- a/weechat/src/irc/irc-send.c
+++ b/weechat/src/irc/irc-send.c
@@ -1807,10 +1807,25 @@ int
 irc_cmd_send_squery (t_irc_server *server, t_irc_channel *channel,
                      char *arguments)
 {
+    char *pos;
+    
     /* make gcc happy */
     (void) channel;
+
+    pos = strchr (arguments, ' ');
+    if (pos)
+    {
+        pos[0] = '\0';
+        pos++;
+        while (pos[0] == ' ')
+        {
+            pos++;
+        }
+        server_sendf (server, "SQUERY %s :%s\r\n", arguments, pos);
+    }
+    else
+        server_sendf (server, "SQUERY %s\r\n", arguments);
     
-    server_sendf (server, "SQUERY %s\r\n", arguments);
     return 0;
 }