diff --git a/plugins/degesch/ping-timeout.lua b/plugins/degesch/ping-timeout.lua
index 12a5221..f871f42 100644
--- a/plugins/degesch/ping-timeout.lua
+++ b/plugins/degesch/ping-timeout.lua
@@ -1,7 +1,7 @@
 --
 -- ping-timeout.lua: ping timeout readability enhancement plugin
 --
--- Copyright (c) 2015, Přemysl Janouch <p.janouch@gmail.com>
+-- Copyright (c) 2015 - 2016, Přemysl Janouch <p.janouch@gmail.com>
 --
 -- Permission to use, copy, modify, and/or distribute this software for any
 -- purpose with or without fee is hereby granted, provided that the above
@@ -17,9 +17,9 @@
 --
 
 degesch.hook_irc (function (hook, server, line)
-	local start, timeout =
-		line:match ("^(:[^ ]* QUIT :Ping timeout:) (%d+) seconds$")
-	if not start then
+	local msg = degesch.parse (line)
+	local start, timeout = line:match ("^(.* :Ping timeout:) (%d+) seconds$")
+	if msg.command ~= "QUIT" or not start then
 		return line
 	end