diff --git a/nmap-service-probes b/nmap-service-probes
index 762f52259..368b14e56 100644
--- a/nmap-service-probes
+++ b/nmap-service-probes
@@ -13688,7 +13688,7 @@ softmatch ftp m|^220[\s-].*ftp[^\r]*\r\n214[\s-]|i
 # TLSv1-only servers, based on a failed handshake alert.
 Probe TCP SSLSessionReq q|\x16\x03\0\0S\x01\0\0O\x03\0?G\xd7\xf7\xba,\xee\xea\xb2`~\xf3\0\xfd\x82{\xb9\xd5\x96\xc8w\x9b\xe6\xc4\xdb<=\xdbo\xef\x10n\0\0(\0\x16\0\x13\0\x0a\0f\0\x05\0\x04\0e\0d\0c\0b\0a\0`\0\x15\0\x12\0\x09\0\x14\0\x11\0\x08\0\x06\0\x03\x01\0|
 rarity 1
-ports 261,271,322,324,443,444,448,465,548,563,585,636,684,853,989,990,992-995,1241,1311,1443,2000,2221,2252,2376,2443,3443,4433,4443,4444,4911,5061,5443,5550,5868,5986,6251,6380,6443,6679,6697,7000,7210,7272,7443,8009,8181,8194,8443,8531,8883,9001,9443,10443,14443,15002,16379,44443,60443
+ports 261,271,322,324,443,444,448,465,548,563,585,636,684,853,989,990,992-995,1241,1311,1443,2000,2221,2252,2376,2443,3443,4433,4443,4444,4911,5061,5349,5443,5550,5868,5986,6251,6380,6443,6679,6697,7000,7210,7272,7443,8009,8181,8194,8443,8531,8883,9001,9443,10443,14443,15002,16379,44443,60443
 fallback GetRequest
 
 # Unknown service on Vingtor-Stentofon IP intercom echoes only up to the first \n, so softmatching until we know more.
diff --git a/nselib/shortport.lua b/nselib/shortport.lua
index e1c785403..82c0e242c 100644
--- a/nselib/shortport.lua
+++ b/nselib/shortport.lua
@@ -198,6 +198,7 @@ http = port_or_service(LIKELY_HTTP_PORTS, LIKELY_HTTP_SERVICES)
 local LIKELY_SSL_PORTS = {
   261, -- nsiiops
   271, -- pt-tls
+  322, -- rtsps
   324, -- rpki-rtr-tls
   443, -- https
   465, -- smtps
@@ -214,17 +215,24 @@ local LIKELY_SSL_PORTS = {
   2221, -- ethernet-ip-s
   2252, -- njenet-ssl
   2376, -- docker-s
+  2482, -- giop-ssl
   3269, -- globalcatLDAPssl
   3389, -- ms-wbt-server
   4433, -- openssl s_server
+  4740, -- ipfixs
   4911, -- ssl/niagara-fox
   5061, -- sip-tls
+  5349, -- stuns
   5986, -- wsmans
+  6380, -- redis-ssl
+  16379, -- redis-ssl
+  6514, -- syslog-tls
   6679,
-  6697,
+  6697, -- ircs-u
   8443, -- https-alt
   9001, -- tor-orport
   8883, -- secure-mqtt
+  11712, -- vSphere LDAP-ssl
 }
 local LIKELY_DTLS_PORTS = {
   443,