diff --git a/ChangeLog.adoc b/ChangeLog.adoc
index a818b040c..cab43e120 100644
--- a/ChangeLog.adoc
+++ b/ChangeLog.adoc
@@ -24,6 +24,7 @@ New features::
   * core: add option "close" in command /window (issue #853)
   * api: add argument "strip_items" in function string_split
   * exec: evaluate option exec.command.shell, change default value to "${env:SHELL}" (issue #1356)
+  * irc: return all arguments in the PONG response to a PING (issue #1369)
 
 Bug fixes::
 
diff --git a/src/plugins/irc/irc-protocol.c b/src/plugins/irc/irc-protocol.c
index c1790e649..e662e8fc7 100644
--- a/src/plugins/irc/irc-protocol.c
+++ b/src/plugins/irc/irc-protocol.c
@@ -2156,7 +2156,7 @@ IRC_PROTOCOL_CALLBACK(ping)
     IRC_PROTOCOL_MIN_ARGS(2);
 
     irc_server_sendf (server, 0, NULL, "PONG :%s",
-                      (argv[1][0] == ':') ? argv[1] + 1 : argv[1]);
+                      (argv_eol[1][0] == ':') ? argv_eol[1] + 1 : argv_eol[1]);
 
     return WEECHAT_RC_OK;
 }