diff --git a/CHANGELOG b/CHANGELOG
index cd34b7a3d..62a763231 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,14 @@
 o Add Famtech Radmin remote control software probe and signatures to
   the Nmap version detection DB. [Tom Sellers, Fyodor]
 
+o Update SSLv2-support NSE script to run against more services which
+  are likely SSL. [Sven Klemm]
+
+o Fixed a man page bug related to our DocBook to Nroff translation
+  software producing incorrect Nroff output.  The man page no longer
+  uses the ".nse" string which was being confused with the Nroff
+  no-space mode command. [Fyodor]
+
 4.53
 
 o Impoved Windows executable installer by making uninstall work better
diff --git a/scripts/SSLv2-support.nse b/scripts/SSLv2-support.nse
index 0f974e72e..165133c08 100644
--- a/scripts/SSLv2-support.nse
+++ b/scripts/SSLv2-support.nse
@@ -7,7 +7,11 @@ categories = {"intrusive"}
 
 require "shortport"
 
-portrule = shortport.port_or_service(443, {"ssl/http", "ssl", "https"})
+local portfunction = shortport.port_or_service({443,993,995},{'https','imaps','pop3s'})
+
+portrule = function( host, port )
+  return portfunction( host, port ) or port.version.service_tunnel == 'ssl'
+end
 
 hex2dec = function(hex)