diff --git a/src/clients/irc/msg.mjs b/src/clients/irc/msg.mjs
index 8fcd0ca..4ca3efb 100644
--- a/src/clients/irc/msg.mjs
+++ b/src/clients/irc/msg.mjs
@@ -1,6 +1,11 @@
 export default client => {
   client._cmd.set("PRIVMSG", function (msg) { // privmsg
-    this.emit("data", msg.params[1] === "\u0001VERSION\u0001" ? ["ctcp:version", this.reply(msg)] : ["message", this.reply(msg)]);
+    if(msg.params[1] === "\u0001VERSION\u0001")
+      return this.emit("data", ["ctcp:version", this.reply(msg)]);
+    else if(msg.params[1].match(/^\u0001PING .*\u0001/i))
+      return this.emit("data", ["ctcp:ping", this.reply(msg)]);
+    else
+      this.emit("data", ["message", this.reply(msg)]);
   }.bind(client));
 
   client._cmd.set("NOTICE", function (msg) { // notice
diff --git a/src/inc/events/ctcp.mjs b/src/inc/events/ctcp.mjs
index e3d5c0c..51b214a 100644
--- a/src/inc/events/ctcp.mjs
+++ b/src/inc/events/ctcp.mjs
@@ -9,4 +9,8 @@ export default self => {
   self.bot.on("ctcp:version", e => {
     e.write(`notice ${e.user.nick} :\u0001VERSION ${versions[~~(Math.random() * versions.length)]}\u0001`);
   });
-};
\ No newline at end of file
+
+  self.bot.on("ctcp:ping", e => {
+    e.write(`notice ${e.user.nick} :${e.message}`);
+  });
+};