diff --git a/Utilities/cmcurl/CMakeLists.txt b/Utilities/cmcurl/CMakeLists.txt
index caa44f1d6..7eb16d317 100644
--- a/Utilities/cmcurl/CMakeLists.txt
+++ b/Utilities/cmcurl/CMakeLists.txt
@@ -169,22 +169,14 @@ IF(NOT CURL_SPECIAL_LIBZ)
   CHECK_LIBRARY_EXISTS_CONCAT("z"      inflateEnd   HAVE_LIBZ)
 ENDIF(NOT CURL_SPECIAL_LIBZ)
 
-OPTION(CMAKE_USE_OPENSSL "Use OpenSSL code." OFF)
+OPTION(CMAKE_USE_OPENSSL "Use OpenSSL code with curl." OFF)
 MARK_AS_ADVANCED(CMAKE_USE_OPENSSL)
 IF(CMAKE_USE_OPENSSL)
   SET(USE_SSLEAY TRUE)
   SET(USE_OPENSSL TRUE)
-  IF(WIN32)
-    FIND_PATH(SSLINCLUDE openssl/crypto.h
-      PATHS c:/hoffman/Tools/openssl_w32vc6-0.9.8g/inc32)
-    INCLUDE_DIRECTORIES(${SSLINCLUDE})
-    FIND_LIBRARY(LIBEAY NAMES libeay32)
-    FIND_LIBRARY(SSLEAY NAMES ssleay32)
-    SET(CURL_LIBS  ${CURL_LIBS} ${LIBEAY} ${SSLEAY} )
-  ELSE(WIN32)
-    CHECK_LIBRARY_EXISTS_CONCAT("crypto" CRYPTO_lock  HAVE_LIBCRYPTO)
-    CHECK_LIBRARY_EXISTS_CONCAT("ssl"    SSL_connect  HAVE_LIBSSL)
-  ENDIF(WIN32)
+  FIND_PACKAGE(OpenSSL REQUIRED)
+  INCLUDE_DIRECTORIES(${OPENSSL_INCLUDE_DIR})
+  SET(CURL_LIBS  ${CURL_LIBS} ${OPENSSL_LIBRARIES})
   SET(CURL_CA_BUNDLE "" CACHE FILEPATH "Path to SSL CA Certificate Bundle")
   MARK_AS_ADVANCED(CURL_CA_BUNDLE)
   IF(CURL_CA_BUNDLE)
diff --git a/Utilities/cmcurl/config.h.in b/Utilities/cmcurl/config.h.in
index 6e74935a3..e18af8ffe 100644
--- a/Utilities/cmcurl/config.h.in
+++ b/Utilities/cmcurl/config.h.in
@@ -255,9 +255,6 @@
 /* Define to 1 if you have the <libssh2.h> header file. */
 #cmakedefine HAVE_LIBSSH2_H ${HAVE_LIBSSH2_H}
 
-/* Define to 1 if you have the `ssl' library (-lssl). */
-#cmakedefine HAVE_LIBSSL ${HAVE_LIBSSL}
-
 /* if zlib is available */
 #cmakedefine HAVE_LIBZ ${HAVE_LIBZ}