diff --git a/scripts/script.db b/scripts/script.db
index 56b8fb765..6aee5578a 100644
--- a/scripts/script.db
+++ b/scripts/script.db
@@ -147,7 +147,7 @@ Entry { filename = "sslv2.nse", categories = { "default", "safe", } }
 Entry { filename = "svn-brute.nse", categories = { "auth", "intrusive", } }
 Entry { filename = "targets-traceroute.nse", categories = { "discovery", "safe", } }
 Entry { filename = "telnet-brute.nse", categories = { "auth", "intrusive", } }
-Entry { filename = "upnp-info.nse", categories = { "default", "safe", } }
+Entry { filename = "upnp-info.nse", categories = { "default", "discovery", "safe", } }
 Entry { filename = "vnc-brute.nse", categories = { "auth", "intrusive", } }
 Entry { filename = "vnc-info.nse", categories = { "discovery", "safe", } }
 Entry { filename = "wdb-version.nse", categories = { "default", "discovery", "version", } }
diff --git a/scripts/upnp-info.nse b/scripts/upnp-info.nse
index 4d00608bb..047a0dd1c 100644
--- a/scripts/upnp-info.nse
+++ b/scripts/upnp-info.nse
@@ -14,7 +14,7 @@ author = "Thomas Buchanan"
 
 license = "Same as Nmap--See http://nmap.org/book/man-legal.html"
 
-categories = {"default", "safe"}
+categories = {"default", "discovery", "safe"}
 
 require("stdnse")
 require("shortport")