diff --git a/ChangeLog b/ChangeLog
index 692aae431..4c29a0b9c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
 WeeChat ChangeLog
 =================
 Sébastien Helleu <flashcode@flashtux.org>
-v0.3.6-rc1, 2011-10-02
+v0.3.6-rc1, 2011-10-03
 
 
 Version 0.3.6 (under dev!)
@@ -87,6 +87,7 @@ Version 0.3.6 (under dev!)
   description for option when function is called)
 * scripts: fix crash with scripts not auto-loaded having a buffer opened after
   /upgrade (input/close callbacks for buffer not set properly)
+* irc: fix crash on malformed irc notice received (without message after target)
 * irc: add missing messages for whois: 223, 264, 343
 * irc: use high priority queue for sending modes and wallchops messages
 * irc: allow reason for command /disconnect
diff --git a/src/plugins/irc/irc-protocol.c b/src/plugins/irc/irc-protocol.c
index 7a530a3e7..f8c5684da 100644
--- a/src/plugins/irc/irc-protocol.c
+++ b/src/plugins/irc/irc-protocol.c
@@ -961,6 +961,8 @@ IRC_PROTOCOL_CALLBACK(notice)
     
     if (argv[0][0] == ':')
     {
+        if (argc < 4)
+            return WEECHAT_RC_ERROR;
         pos_target = argv[2];
         if ((pos_target[0] == '@') && (irc_channel_is_channel (pos_target + 1)))
         {