diff --git a/CHANGELOG b/CHANGELOG
index 0b33cd9a7..f1a0f6a0e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,8 @@
 #Nmap Changelog ($Id$); -*-text-*-
 
+o [NSE][GH#1473] SNMP scripts are now enabled on non-standard ports where SNMP
+  has been detected [usd-markus, nnposter]
+
 o [NSE][GH#2084] MQTT library was using incorrect position when parsing
   received responses [tatulea]
 
diff --git a/scripts/snmp-brute.nse b/scripts/snmp-brute.nse
index 450b3ca4a..c64a594c1 100644
--- a/scripts/snmp-brute.nse
+++ b/scripts/snmp-brute.nse
@@ -56,7 +56,7 @@ license = "Same as Nmap--See https://nmap.org/book/man-legal.html"
 categories = {"intrusive", "brute"}
 
 
-portrule = shortport.portnumber(161, "udp", {"open", "open|filtered"})
+portrule = shortport.port_or_service(161, "snmp", "udp", {"open", "open|filtered"})
 
 local communitiestable = {}
 
@@ -171,7 +171,8 @@ local sniff_snmp_responses = function(host, port, lport, result)
   local condvar = nmap.condvar(result)
   local pcap = nmap.new_socket()
   pcap:set_timeout(host.times.timeout * 1000 * 3)
-  pcap:pcap_open(host.interface, 300, false, "src host ".. host.ip .." and udp and src port 161 and dst port "..lport)
+  pcap:pcap_open(host.interface, 300, false,
+    ("src host %s and udp and src port %d and dst port %d"):format(host.ip, port.number, lport))
 
   local communities = creds.Credentials:new(SCRIPT_NAME, host, port)
 
diff --git a/scripts/snmp-hh3c-logins.nse b/scripts/snmp-hh3c-logins.nse
index c5afb64f9..de3971a2c 100644
--- a/scripts/snmp-hh3c-logins.nse
+++ b/scripts/snmp-hh3c-logins.nse
@@ -53,7 +53,7 @@ dependencies = {"snmp-brute"}
 -- Updated 11/08/2012 - v0.3 - added xmloutput
 
 
-portrule = shortport.portnumber(161, "udp", {"open", "open|filtered"})
+portrule = shortport.port_or_service(161, "snmp", "udp", {"open", "open|filtered"})
 
 --- Gets a value for the specified oid
 --
diff --git a/scripts/snmp-interfaces.nse b/scripts/snmp-interfaces.nse
index 18645fa50..b2d81e98a 100644
--- a/scripts/snmp-interfaces.nse
+++ b/scripts/snmp-interfaces.nse
@@ -61,7 +61,7 @@ prerule = function()
   return true
 end
 
-portrule = shortport.portnumber(161, "udp", {"open", "open|filtered"})
+portrule = shortport.port_or_service(161, "snmp", "udp", {"open", "open|filtered"})
 
 -- List of IANA-assigned network interface types
 -- Taken from IANAifType-MIB
diff --git a/scripts/snmp-ios-config.nse b/scripts/snmp-ios-config.nse
index 7608c8f21..19652433d 100644
--- a/scripts/snmp-ios-config.nse
+++ b/scripts/snmp-ios-config.nse
@@ -45,7 +45,7 @@ categories = {"intrusive"}
 dependencies = {"snmp-brute"}
 
 
-portrule = shortport.portnumber(161, "udp", {"open", "open|filtered"})
+portrule = shortport.port_or_service(161, "snmp", "udp", {"open", "open|filtered"})
 
 local function fail (err) return stdnse.format_output(false, err) end
 ---
diff --git a/scripts/snmp-netstat.nse b/scripts/snmp-netstat.nse
index 74c1ccbef..97f503ad8 100644
--- a/scripts/snmp-netstat.nse
+++ b/scripts/snmp-netstat.nse
@@ -40,7 +40,7 @@ dependencies = {"snmp-brute"}
 -- Revised 07/26/2012 - v0.3 - added newtargets support
 
 
-portrule = shortport.portnumber(161, "udp", {"open", "open|filtered"})
+portrule = shortport.port_or_service(161, "snmp", "udp", {"open", "open|filtered"})
 
 --- Processes the table and creates the script output
 --
diff --git a/scripts/snmp-processes.nse b/scripts/snmp-processes.nse
index c1fbe5b71..f42363e51 100644
--- a/scripts/snmp-processes.nse
+++ b/scripts/snmp-processes.nse
@@ -72,7 +72,7 @@ dependencies = {"snmp-brute"}
 -- Revised 04/11/2010 - v0.4 - moved snmp_walk to snmp library <patrik@cqure.net>
 
 
-portrule = shortport.portnumber(161, "udp", {"open", "open|filtered"})
+portrule = shortport.port_or_service(161, "snmp", "udp", {"open", "open|filtered"})
 
 --- Gets a value for the specified oid
 --
diff --git a/scripts/snmp-sysdescr.nse b/scripts/snmp-sysdescr.nse
index 45faeb169..24f3d00e2 100644
--- a/scripts/snmp-sysdescr.nse
+++ b/scripts/snmp-sysdescr.nse
@@ -25,7 +25,7 @@ categories = {"default", "discovery", "safe"}
 dependencies = {"snmp-brute"}
 
 
-portrule = shortport.portnumber(161, "udp", {"open", "open|filtered"})
+portrule = shortport.port_or_service(161, "snmp", "udp", {"open", "open|filtered"})
 
 ---
 -- Sends SNMP packets to host and reads responses
diff --git a/scripts/snmp-win32-services.nse b/scripts/snmp-win32-services.nse
index 9f8fda831..52cbdb78e 100644
--- a/scripts/snmp-win32-services.nse
+++ b/scripts/snmp-win32-services.nse
@@ -51,7 +51,7 @@ dependencies = {"snmp-brute"}
 -- Revised 04/11/2010 - v0.3 - moved snmp_walk to snmp library <patrik@cqure.net>
 
 
-portrule = shortport.portnumber(161, "udp", {"open", "open|filtered"})
+portrule = shortport.port_or_service(161, "snmp", "udp", {"open", "open|filtered"})
 
 
 --- Processes the table and creates the script output
diff --git a/scripts/snmp-win32-shares.nse b/scripts/snmp-win32-shares.nse
index 0d5f763bc..f135fcd86 100644
--- a/scripts/snmp-win32-shares.nse
+++ b/scripts/snmp-win32-shares.nse
@@ -32,7 +32,7 @@ dependencies = {"snmp-brute"}
 -- Revised 04/11/2010 - v0.3 - moved snmp_walk to snmp library <patrik@cqure.net>
 
 
-portrule = shortport.portnumber(161, "udp", {"open", "open|filtered"})
+portrule = shortport.port_or_service(161, "snmp", "udp", {"open", "open|filtered"})
 
 --- Gets a value for the specified oid
 --
diff --git a/scripts/snmp-win32-software.nse b/scripts/snmp-win32-software.nse
index bf87ae5ce..062fbd3ae 100644
--- a/scripts/snmp-win32-software.nse
+++ b/scripts/snmp-win32-software.nse
@@ -64,7 +64,7 @@ dependencies = {"snmp-brute"}
 -- Revised 04/11/2010 - v0.3 - moved snmp_walk to snmp library <patrik@cqure.net>
 
 
-portrule = shortport.portnumber(161, "udp", {"open", "open|filtered"})
+portrule = shortport.port_or_service(161, "snmp", "udp", {"open", "open|filtered"})
 
 --- Gets a value for the specified oid
 --
diff --git a/scripts/snmp-win32-users.nse b/scripts/snmp-win32-users.nse
index 6c83dded9..6576c3560 100644
--- a/scripts/snmp-win32-users.nse
+++ b/scripts/snmp-win32-users.nse
@@ -44,7 +44,7 @@ dependencies = {"snmp-brute"}
 -- Revised 04/11/2010 - v0.3 - moved snmp_walk to snmp library <patrik@cqure.net>
 
 
-portrule = shortport.portnumber(161, "udp", {"open", "open|filtered"})
+portrule = shortport.port_or_service(161, "snmp", "udp", {"open", "open|filtered"})
 
 --- Processes the table and creates the script output
 --