diff --git a/cmake/find_openssl.cmake b/cmake/find_openssl.cmake
index 4586831c632..4a73cbb0c28 100644
--- a/cmake/find_openssl.cmake
+++ b/cmake/find_openssl.cmake
@@ -5,11 +5,12 @@ endif ()
 find_package (OpenSSL)
 if (NOT OPENSSL_FOUND)
     # Try to find manually.
-    set (OPENSSL_INCLUDE_DIR "/usr/local/opt/openssl/include")
+    set (OPENSSL_INCLUDE_PATHS "/usr/local/opt/openssl/include")
     set (OPENSSL_PATHS "/usr/local/opt/openssl/lib")
+    find_path (OPENSSL_INCLUDE_DIR NAMES openssl/ssl.h PATHS ${OPENSSL_INCLUDE_PATHS})
     find_library (OPENSSL_SSL_LIBRARY ssl PATHS ${OPENSSL_PATHS})
     find_library (OPENSSL_CRYPTO_LIBRARY crypto PATHS ${OPENSSL_PATHS})
-    if (OPENSSL_SSL_LIBRARY AND OPENSSL_CRYPTO_LIBRARY)
+    if (OPENSSL_SSL_LIBRARY AND OPENSSL_CRYPTO_LIBRARY AND OPENSSL_INCLUDE_DIR)
         set (OPENSSL_LIBRARIES ${OPENSSL_SSL_LIBRARY} ${OPENSSL_CRYPTO_LIBRARY})
         set (OPENSSL_FOUND 1)
     endif ()
diff --git a/cmake/find_readline_edit.cmake b/cmake/find_readline_edit.cmake
index 6c1e116cf96..ded4edc19c8 100644
--- a/cmake/find_readline_edit.cmake
+++ b/cmake/find_readline_edit.cmake
@@ -24,7 +24,7 @@ if (READLINE_LIB AND TERMCAP_LIB)
         set (LINE_EDITING_LIBS ${READLINE_LIB} ${TERMCAP_LIB})
         message (STATUS "Using line editing libraries (readline): ${READLINE_INCLUDE_DIR} : ${LINE_EDITING_LIBS}")
     endif ()
-elseif (EDIT_LIB)
+elseif (EDIT_LIB AND TERMCAP_LIB)
     find_library (CURSES_LIB NAMES curses)
     find_path (READLINE_INCLUDE_DIR NAMES editline/readline.h PATHS ${READLINE_INCLUDE_PATHS})
     if (CURSES_LIB AND READLINE_INCLUDE_DIR)