diff --git a/CMakeLists.txt b/CMakeLists.txt
index 866b463a..75855d2a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -305,9 +305,7 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
         ${OPENSSL_ROOT}/lib/libcrypto.a
     )
 elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-    set(OPENSSL_USE_STATIC_LIBS TRUE)
-    find_package(OpenSSL REQUIRED)
-    set(OPENSSL_LIBS ${OPENSSL_LIBRARIES} pthread dl)
+    set (OPENSSL_LIBS ssl crypto)
 else()
     message (FATAL_ERROR "Couldn't find OpenSSL")
 endif()
diff --git a/src/cmd/synergyc/CMakeLists.txt b/src/cmd/synergyc/CMakeLists.txt
index ec243d93..f6a9cc32 100644
--- a/src/cmd/synergyc/CMakeLists.txt
+++ b/src/cmd/synergyc/CMakeLists.txt
@@ -48,7 +48,7 @@ endif()
 
 add_executable(synergyc ${sources})
 target_link_libraries(synergyc
-    arch base client common io mt net ipc platform server synlib ${OPENSSL_LIBS})
+    arch base client common io mt net ipc platform server synlib ${libs} ${OPENSSL_LIBS})
 
 if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
     install (TARGETS synergyc DESTINATION ${SYNERGY_BUNDLE_BINARY_DIR})
diff --git a/src/lib/net/SecureSocket.cpp b/src/lib/net/SecureSocket.cpp
index 938a369b..72d1aa29 100644
--- a/src/lib/net/SecureSocket.cpp
+++ b/src/lib/net/SecureSocket.cpp
@@ -37,15 +37,6 @@
 
 #define MAX_ERROR_SIZE 65535
 
-//Add the new function names in case older ones are deprecated
-#if OPENSSL_VERSION_NUMBER > 0x10100000L
-#define SSL_SERVER_METHOD TLS_server_method
-#define SSL_CLIENT_METHOD TLS_client_method
-#else
-#define SSL_SERVER_METHOD SSLv23_server_method
-#define SSL_CLIENT_METHOD SSLv23_server_method
-#endif
-
 static const float s_retryDelay = 0.01f;
 
 enum {
@@ -392,10 +383,10 @@ SecureSocket::initContext(bool server)
     }
 
     if (server) {
-        method = SSL_SERVER_METHOD();
+        method = SSLv23_server_method();
     }
     else {
-        method = SSL_CLIENT_METHOD();
+        method = SSLv23_client_method();
     }
     
     // create new context from method