@@ -1542,11 +1542,11 @@
 	esac
 
 	AC_ARG_WITH(tls,
 		AS_HELP_STRING([--with-tls], [
 			enable TLS support using the specified library
-			(yes, gnutls, securetransport or no)]))
+			(yes, openssl, gnutls, securetransport or no)]))
 	AS_IF([test x"$with_tls" = x""], [with_tls="yes"])
 	tls_support="no"
 
 	AS_IF([test x"$with_tls" = x"securetransport" \
 		-o x"$with_tls" = x"yes"], [
@@ -1569,10 +1569,26 @@
 			], [])
 
 			LIBS="$old_LIBS"
 		])
 	])
+
+	AS_IF([test x"$with_tls" = x"openssl" \
+		-o \( x"$with_tls" = x"yes" -a x"$tls_support" = x"no" \)], [
+		AC_CHECK_LIB(ssl, SSL_set1_host, [
+			AC_CHECK_HEADER(openssl/ssl.h, [
+				AC_DEFINE(HAVE_OPENSSL, 1,
+					[Whether we have OpenSSL])
+
+				tls_support="OpenSSL"
+				TLS_LIBS="-lssl -lcrypto $TLS_LIBS"
+
+				AC_SUBST(OF_OPENSSL_TLS_STREAM_M,
+					"OFOpenSSLTLSStream.m")
+			])
+		], [], [-lcrypto])
+	])
 
 	AS_IF([test x"$with_tls" = x"gnutls" \
 		-o \( x"$with_tls" = x"yes" -a x"$tls_support" = x"no" \)], [
 		PKG_CHECK_MODULES(gnutls, [gnutls >= 3.5.0], [
 			AC_DEFINE(HAVE_GNUTLS, 1, [Whether we have GnuTLS])
@@ -1612,12 +1628,12 @@
 		])
 	])
 
 	AS_IF([test x"$with_tls" != x"no" -a x"$tls_support" = x"no"], [
 		AC_MSG_ERROR(m4_normalize([
-			No TLS implementation was found. Please install GnuTLS
-			or use --without-tls.
+			No TLS implementation was found. Please install OpenSSL,
+			GnuTLS or use --without-tls.
 		]))
 	])
 
 	AS_IF([test x"$enable_threads" != x"no"], [
 		AC_SUBST(OF_HTTP_CLIENT_TESTS_M, "OFHTTPClientTests.m")