diff --git a/ChangeLog b/ChangeLog
index 24d4bc538..0dece7bdf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,10 @@
 WeeChat - Wee Enhanced Environment for Chat
 ===========================================
 
-ChangeLog - 2006-05-01
+ChangeLog - 2006-06-07
 
 Version 0.2.0 (under dev!):
+   * fixed bug with connection to bnc (bug #16760)
    * command /save now writes plugins options (~/.weechat/plugins.rc)
    * fixed crash with "register" function in plugin scripts (bug #16701)
    * fixed random crash at exit (/quit or /upgrade) with splited windows
diff --git a/src/irc/irc-commands.c b/src/irc/irc-commands.c
index 2f3769f88..87b0df128 100644
--- a/src/irc/irc-commands.c
+++ b/src/irc/irc-commands.c
@@ -306,13 +306,13 @@ t_irc_command irc_commands[] =
        "  target: reply should match this mask"),
     "", 1, MAX_ARGS, 0, 1, NULL, irc_cmd_send_whowas, NULL },
   { "001", N_("a server message"), "", "",
-    NULL, 0, 0, 0, 1, NULL, NULL, irc_cmd_recv_server_msg },
+    NULL, 0, 0, 0, 1, NULL, NULL, irc_cmd_recv_001 },
   { "002", N_("a server message"), "", "",
     NULL, 0, 0, 0, 1, NULL, NULL, irc_cmd_recv_server_msg },
   { "003", N_("a server message"), "", "",
     NULL, 0, 0, 0, 1, NULL, NULL, irc_cmd_recv_server_msg },
   { "004", N_("a server message"), "", "",
-    NULL, 0, 0, 0, 1, NULL, NULL, irc_cmd_recv_004 },
+    NULL, 0, 0, 0, 1, NULL, NULL, irc_cmd_recv_server_msg },
   { "005", N_("a server message"), "", "",
     NULL, 0, 0, 0, 1, NULL, NULL, irc_cmd_recv_server_msg },
   { "006", N_("a server message"), "", "",
diff --git a/src/irc/irc-recv.c b/src/irc/irc-recv.c
index 73b8f6fae..a28478207 100644
--- a/src/irc/irc-recv.c
+++ b/src/irc/irc-recv.c
@@ -2811,11 +2811,11 @@ irc_cmd_recv_topic (t_irc_server *server, char *host, char *nick, char *argument
 }
 
 /*
- * irc_cmd_recv_004: '004' command (connected to irc server)
+ * irc_cmd_recv_001: '001' command (connected to irc server)
  */
 
 int
-irc_cmd_recv_004 (t_irc_server *server, char *host, char *nick, char *arguments)
+irc_cmd_recv_001 (t_irc_server *server, char *host, char *nick, char *arguments)
 {
     char *pos;
     char **commands, **ptr;
diff --git a/src/irc/irc.h b/src/irc/irc.h
index 204d81b41..4f96b30d3 100644
--- a/src/irc/irc.h
+++ b/src/irc/irc.h
@@ -516,7 +516,6 @@ extern int irc_cmd_recv_server_msg (t_irc_server *, char *, char *, char *);
 extern int irc_cmd_recv_server_reply (t_irc_server *, char *, char *, char *);
 extern int irc_cmd_recv_topic (t_irc_server *, char *, char *, char *);
 extern int irc_cmd_recv_001 (t_irc_server *, char *, char *, char *);
-extern int irc_cmd_recv_004 (t_irc_server *, char *, char *, char *);
 extern int irc_cmd_recv_221 (t_irc_server *, char *, char *, char *);
 extern int irc_cmd_recv_301 (t_irc_server *, char *, char *, char *);
 extern int irc_cmd_recv_302 (t_irc_server *, char *, char *, char *);
diff --git a/weechat/ChangeLog b/weechat/ChangeLog
index 24d4bc538..0dece7bdf 100644
--- a/weechat/ChangeLog
+++ b/weechat/ChangeLog
@@ -1,9 +1,10 @@
 WeeChat - Wee Enhanced Environment for Chat
 ===========================================
 
-ChangeLog - 2006-05-01
+ChangeLog - 2006-06-07
 
 Version 0.2.0 (under dev!):
+   * fixed bug with connection to bnc (bug #16760)
    * command /save now writes plugins options (~/.weechat/plugins.rc)
    * fixed crash with "register" function in plugin scripts (bug #16701)
    * fixed random crash at exit (/quit or /upgrade) with splited windows
diff --git a/weechat/src/irc/irc-commands.c b/weechat/src/irc/irc-commands.c
index 2f3769f88..87b0df128 100644
--- a/weechat/src/irc/irc-commands.c
+++ b/weechat/src/irc/irc-commands.c
@@ -306,13 +306,13 @@ t_irc_command irc_commands[] =
        "  target: reply should match this mask"),
     "", 1, MAX_ARGS, 0, 1, NULL, irc_cmd_send_whowas, NULL },
   { "001", N_("a server message"), "", "",
-    NULL, 0, 0, 0, 1, NULL, NULL, irc_cmd_recv_server_msg },
+    NULL, 0, 0, 0, 1, NULL, NULL, irc_cmd_recv_001 },
   { "002", N_("a server message"), "", "",
     NULL, 0, 0, 0, 1, NULL, NULL, irc_cmd_recv_server_msg },
   { "003", N_("a server message"), "", "",
     NULL, 0, 0, 0, 1, NULL, NULL, irc_cmd_recv_server_msg },
   { "004", N_("a server message"), "", "",
-    NULL, 0, 0, 0, 1, NULL, NULL, irc_cmd_recv_004 },
+    NULL, 0, 0, 0, 1, NULL, NULL, irc_cmd_recv_server_msg },
   { "005", N_("a server message"), "", "",
     NULL, 0, 0, 0, 1, NULL, NULL, irc_cmd_recv_server_msg },
   { "006", N_("a server message"), "", "",
diff --git a/weechat/src/irc/irc-recv.c b/weechat/src/irc/irc-recv.c
index 73b8f6fae..a28478207 100644
--- a/weechat/src/irc/irc-recv.c
+++ b/weechat/src/irc/irc-recv.c
@@ -2811,11 +2811,11 @@ irc_cmd_recv_topic (t_irc_server *server, char *host, char *nick, char *argument
 }
 
 /*
- * irc_cmd_recv_004: '004' command (connected to irc server)
+ * irc_cmd_recv_001: '001' command (connected to irc server)
  */
 
 int
-irc_cmd_recv_004 (t_irc_server *server, char *host, char *nick, char *arguments)
+irc_cmd_recv_001 (t_irc_server *server, char *host, char *nick, char *arguments)
 {
     char *pos;
     char **commands, **ptr;
diff --git a/weechat/src/irc/irc.h b/weechat/src/irc/irc.h
index 204d81b41..4f96b30d3 100644
--- a/weechat/src/irc/irc.h
+++ b/weechat/src/irc/irc.h
@@ -516,7 +516,6 @@ extern int irc_cmd_recv_server_msg (t_irc_server *, char *, char *, char *);
 extern int irc_cmd_recv_server_reply (t_irc_server *, char *, char *, char *);
 extern int irc_cmd_recv_topic (t_irc_server *, char *, char *, char *);
 extern int irc_cmd_recv_001 (t_irc_server *, char *, char *, char *);
-extern int irc_cmd_recv_004 (t_irc_server *, char *, char *, char *);
 extern int irc_cmd_recv_221 (t_irc_server *, char *, char *, char *);
 extern int irc_cmd_recv_301 (t_irc_server *, char *, char *, char *);
 extern int irc_cmd_recv_302 (t_irc_server *, char *, char *, char *);