diff --git a/src/lib/tls_openssl.c b/src/lib/tls_openssl.c
index 39ab6c9..010e7c7 100644
--- a/src/lib/tls_openssl.c
+++ b/src/lib/tls_openssl.c
@@ -393,12 +393,13 @@ TLS_CONTEXT *new_tls_context(const char *ca_certfile,
    /*
     * Allocate our OpenSSL TLSv1 Context
     */
-   ctx->openssl = SSL_CTX_new(TLSv1_method());
+   ctx->openssl = SSL_CTX_new(SSLv23_method());
 
    if (!ctx->openssl) {
       openssl_post_errors(M_FATAL, _("Error initializing SSL context"));
       goto err;
    }
+   SSL_CTX_set_options(ctx->openssl, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
 
    /*
     * Set up pem encryption callback