diff --git a/Jamfile b/Jamfile
index 7233e02d..87ef401d 100644
--- a/Jamfile
+++ b/Jamfile
@@ -16,6 +16,7 @@ import modules ;
 import testing ;
 import ../config/checks/config : requires ;
 
+using openssl ;
 boost.use-project ;
 
 lib socket ; # SOLARIS, QNXNTO
@@ -25,54 +26,6 @@ lib mswsock ; # NT
 lib ipv6 ; # HPUX
 lib network ; # HAIKU
 
-lib ssl ;
-lib crypto ;
-lib crypt32 ;
-
-# Microsoft Windows section. Refer to FAQ "Windows and OpenSSL"
-if [ os.name ] = NT
-{
-  local OPENSSL_ROOT_DEFAULT = "C:/OpenSSL" ;
-  local OPENSSL_ROOT_ENV = [ os.environ OPENSSL_ROOT ] ;
-  local OPENSSL_ROOT = "" ;
-  if $(OPENSSL_ROOT_ENV)
-    {
-       OPENSSL_ROOT = $(OPENSSL_ROOT_ENV) ;
-    }
-  else 
-    {
-      OPENSSL_ROOT = $(OPENSSL_ROOT_DEFAULT) ;
-    }
-  project
-    : requirements
-      <include>$(OPENSSL_ROOT)/include
-      <variant>debug:<library-path>$(OPENSSL_ROOT)/lib
-      <target-os>windows<variant>debug:<library-path>$(OPENSSL_ROOT)/debug/lib
-      <variant>release:<library-path>$(OPENSSL_ROOT)/lib
-    ;
-
-  if [ path.exists $(OPENSSL_ROOT)/lib/libssl.lib ]
-    {
-      echo "OpenSSL > 1.1.0. Including libssl" ;
-      lib ssl : : <target-os>windows <name>libssl ;
-    }
-  if [ path.exists $(OPENSSL_ROOT)/lib/libcrypto.lib ]
-    {
-      echo "OpenSSL > 1.1.0. Including libcrypto" ;
-      lib crypto : : <target-os>windows <name>libcrypto ;
-    }
-  if [ path.exists $(OPENSSL_ROOT)/lib/ssleay32.lib ]
-    {
-      echo "OpenSSL < 1.1.0. Including ssleay32" ;
-      lib ssl : : <target-os>windows <name>ssleay32 ;
-    }
-  if [ path.exists $(OPENSSL_ROOT)/lib/libeay32.lib ]
-    {
-      echo "OpenSSL < 1.1.0. Including libeay32" ;
-      lib crypto : : <target-os>windows <name>libeay32 ;
-    }
-}
-
 feature.feature boost.beast.allow-deprecated : on off : propagated composite ;
 feature.compose <boost.beast.allow-deprecated>on : <define>BOOST_BEAST_ALLOW_DEPRECATED ;
 
@@ -157,10 +110,12 @@ lib lib-asio-ssl
     : requirements
         <link>static
         $(defines)
-        [ ac.check-library /boost/beast//ssl : <library>/boost/beast//ssl/<link>shared : <build>no ]
-        [ ac.check-library /boost/beast//crypto : <library>/boost/beast//crypto/<link>shared : <build>no ]
+        [ ac.check-library /openssl//ssl : <library>/openssl//ssl/<link>shared : <build>no ]
+        [ ac.check-library /openssl//crypto : <library>/openssl//crypto/<link>shared : <build>no ]
     : usage-requirements
         $(defines)
+        [ ac.check-library /openssl//ssl : <library>/openssl//ssl/<link>shared : <build>no ]
+        [ ac.check-library /openssl//crypto : <library>/openssl//crypto/<link>shared : <build>no ]
     ;
 
 lib lib-beast