diff --git a/ChangeLog.asciidoc b/ChangeLog.asciidoc
index 6ee877952..c45a8cf53 100644
--- a/ChangeLog.asciidoc
+++ b/ChangeLog.asciidoc
@@ -105,6 +105,7 @@ http://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes]
 * alias: change default command for alias /beep to "/print -beep"
 * exec: add exec plugin: new command /exec and file exec.conf
 * guile: fix module used after unload of a script
+* irc: display message 936 (censored word) on channel instead of server buffer
 * irc: add bar item "irc_nick_modes" (closes #71)
 * irc: make reason optional in command /kill
 * irc: add support of message 324 (channel modes) in option
diff --git a/src/plugins/irc/irc-protocol.c b/src/plugins/irc/irc-protocol.c
index 2b0f817f0..4016349e9 100644
--- a/src/plugins/irc/irc-protocol.c
+++ b/src/plugins/irc/irc-protocol.c
@@ -5352,6 +5352,7 @@ irc_protocol_recv_command (struct t_irc_server *server,
           { "905", /* SASL message too long */ 1, 0, &irc_protocol_cb_sasl_end },
           { "906", /* SASL authentication aborted */ 1, 0, &irc_protocol_cb_sasl_end },
           { "907", /* You have already completed SASL authentication */ 1, 0, &irc_protocol_cb_sasl_end },
+          { "936", /* censored word */ 1, 0, &irc_protocol_cb_generic_error },
           { "973", /* whois (secure connection) */ 1, 0, &irc_protocol_cb_server_mode_reason },
           { "974", /* whois (secure connection) */ 1, 0, &irc_protocol_cb_server_mode_reason },
           { "975", /* whois (secure connection) */ 1, 0, &irc_protocol_cb_server_mode_reason },