diff --git a/scripts/nat-pmp-info.nse b/scripts/nat-pmp-info.nse
index a57b5da67..eaa51698b 100644
--- a/scripts/nat-pmp-info.nse
+++ b/scripts/nat-pmp-info.nse
@@ -24,12 +24,12 @@ Queries the NAT-PMP service for the external address
 
 author = "Patrik Karlsson"
 license = "Same as Nmap--See http://nmap.org/book/man-legal.html"
-categories = {"safe", "discovery"}
+categories = {"default", "safe", "discovery"}
 
 require "stdnse"
 require "shortport"
 
-portrule = shortport.portnumber(5351, "udp", {"open", "open|filtered"})
+portrule = shortport.port_or_service(5351, "nat-pmp", "udp")
 
 process_response = function( data )
 
@@ -96,8 +96,9 @@ action = function( host, port )
 	
 	-- set port to open
     nmap.set_port_state(host, port, "open")
+	port.version.name = "nat-pmp"
 	nmap.set_port_version(host, port, "hardmatched")
 	
 	return ("  \n  External ip: %s"):format( external_ip )
 
-end
\ No newline at end of file
+end
diff --git a/scripts/script.db b/scripts/script.db
index 7e1689b71..bfb2a73f6 100644
--- a/scripts/script.db
+++ b/scripts/script.db
@@ -83,7 +83,7 @@ Entry { filename = "mysql-empty-password.nse", categories = { "auth", "intrusive
 Entry { filename = "mysql-info.nse", categories = { "default", "discovery", "safe", } }
 Entry { filename = "mysql-users.nse", categories = { "discovery", "intrusive", } }
 Entry { filename = "mysql-variables.nse", categories = { "discovery", "intrusive", } }
-Entry { filename = "nat-pmp-info.nse", categories = { "discovery", "safe", } }
+Entry { filename = "nat-pmp-info.nse", categories = { "default", "discovery", "safe", } }
 Entry { filename = "nbstat.nse", categories = { "default", "discovery", "safe", } }
 Entry { filename = "nfs-ls.nse", categories = { "discovery", "safe", } }
 Entry { filename = "nfs-showmount.nse", categories = { "discovery", "safe", } }