diff --git a/scripts/ircServerInfo.nse b/scripts/ircServerInfo.nse
index b77cd8b5d..ab8f4c1a6 100644
--- a/scripts/ircServerInfo.nse
+++ b/scripts/ircServerInfo.nse
@@ -11,7 +11,12 @@ categories = {"discovery"}
 require("stdnse")
 require "shortport"
 
-portrule = shortport.port_or_service(6667, "irc")
+portrule = function(host, port)
+  return (port.number == 6666 or
+          port.number == 6667 or
+          port.service == "irc" or
+          port.service == "irc-serv") and port.protocol == "tcp"
+end
 
 init = function()
   -- Start of MOTD, we'll take the server name from here