diff --git a/Makefile b/Makefile
index 006b5b1..8d1300c 100644
--- a/Makefile
+++ b/Makefile
@@ -46,9 +46,9 @@ OPTFLAGS += -DSO_REUSEPORT
 
 # END system dependant block
 
-SSL_LIBS := $(shell pkg-config --libs libssl 2>/dev/null)
-ifeq ($(SSL_LIBS),)
 SSL_LIBS := $(shell pkg-config --libs openssl 2>/dev/null)
+ifeq ($(SSL_LIBS),)
+SSL_LIBS := $(shell pkg-config --libs libssl 2>/dev/null)
 endif
 ifeq ($(SSL_LIBS),)
 SSL_LIBS := -lssl -lcrypto
diff --git a/ptstream.c b/ptstream.c
index 4c87c80..6d55137 100644
--- a/ptstream.c
+++ b/ptstream.c
@@ -151,7 +151,7 @@ int stream_enable_ssl(PTSTREAM *pts) {
 	
 	/* Initialise the connection */
 	SSLeay_add_ssl_algorithms();
-	meth = SSLv3_client_method();
+	meth = SSLv23_client_method();
 	SSL_load_error_strings();
 
 	ctx = SSL_CTX_new (meth);