diff --git a/src/common/xmpp/tls_nb.py b/src/common/xmpp/tls_nb.py
index 850549b14..bb6581657 100644
--- a/src/common/xmpp/tls_nb.py
+++ b/src/common/xmpp/tls_nb.py
@@ -329,7 +329,8 @@ class NonBlockingTLS(PlugIn):
 		log.debug("_startSSL_pyOpenSSL called")
 		tcpsock = self._owner
 		# See http://docs.python.org/dev/library/ssl.html
-		tcpsock._sslContext = OpenSSL.SSL.Context(OpenSSL.SSL.SSLv3_METHOD)
+		tcpsock._sslContext = OpenSSL.SSL.Context(OpenSSL.SSL.SSLv23_METHOD)
+		tcpsock._sslContext.set_options(OpenSSL.SSL.OP_NO_SSLv2)
 		tcpsock.ssl_errnum = 0
 		tcpsock._sslContext.set_verify(OpenSSL.SSL.VERIFY_PEER,
 			self._ssl_verify_callback)