diff --git a/CHANGELOG b/CHANGELOG
index 2037e3ea8..37e1be968 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -35,6 +35,10 @@ o Fix a couple bugs in the way the Nmap built system checked for an
   configure option for specifying your own liblua. [Daniel
   Roethlisberger]
 
+o Changed SSLv2-support.nse so that it only enumerates the list of
+  available ciphers with a verbosity level of at least two or with
+  debugging enabled. [Kris]
+
 o Removed mswindowsShell.nse as there is a version detection NULL probe
   match which accomplishes the same thing. [Brandon, Fyodor, Kris]
 
diff --git a/scripts/SSLv2-support.nse b/scripts/SSLv2-support.nse
index c0b7ff13b..07d3aa8f5 100644
--- a/scripts/SSLv2-support.nse
+++ b/scripts/SSLv2-support.nse
@@ -204,7 +204,9 @@ action = function(host, port)
 		return_string = "server still supports SSLv2\n";
 	end
 
-	available_cyphers = cyphers(cypher_list, cyphers_len);
+	if (nmap.verbosity() > 1 or nmap.debugging() > 0) then
+		available_cyphers = cyphers(cypher_list, cyphers_len);
+	end
 
 	if (	string.len(return_string) > 0
 	or	string.len(available_cyphers) > 0) then