diff --git a/CHANGELOG b/CHANGELOG
index 3c19fbf81..8ca08c0ca 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,11 @@
 # Nmap Changelog ($Id$); -*-text-*-
 
+o Fixed a bug in the showOwner NSE script which caused it to try UDP
+  ports instead of just TCP ports.  This made it very slow in the
+  common case where there are many UDP ports in the open|filtered
+  state.  Thanks to Jason DePriest for reporting the problem and Jah
+  for tracking it down and fixing it.
+
 o A bug was fixed that could cause Zenmap to crash when loading a
   results file that had multibyte characters in it. The error looked
   like
diff --git a/scripts/showOwner.nse b/scripts/showOwner.nse
index 330178770..815d6ceef 100644
--- a/scripts/showOwner.nse
+++ b/scripts/showOwner.nse
@@ -9,15 +9,17 @@ license = "Same as Nmap--See http://nmap.org/book/man-legal.html"
 
 categories = {"safe"}
 
-portrule = function(host, port) 
+portrule = function(host, port)
 	local identd, decision
 
 	local auth_port = { number=113, protocol="tcp" }
 	identd = nmap.get_port_state(host, auth_port)
 
-	if 
+	if
 		identd ~= nil
-		and identd.state == "open" 
+		and identd.state == "open"
+		and port.protocol == "tcp"
+		and port.state == "open"
 	then
 		decision = true
 	else