diff --git a/CMakeLists.txt b/CMakeLists.txt
index aaa6029..4648eec 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -107,6 +107,7 @@ endif()
 if(LIBGCRYPT_LIBRARIES)
   message(STATUS "Found libgcrypt: ${LIBGCRYPT_LIBRARIES}")
   set(LIBVNCSERVER_WITH_CLIENT_GCRYPT 1)
+  set(ADDITIONAL_LIBS ${ADDITIONAL_LIBS} ${LIBGCRYPT_LIBRARIES})
 endif(LIBGCRYPT_LIBRARIES)
 
 
@@ -259,7 +260,7 @@ endif(LIBVNCSERVER_WITH_WEBSOCKETS)
 add_library(vncclient SHARED ${LIBVNCCLIENT_SOURCES})
 add_library(vncserver SHARED ${LIBVNCSERVER_SOURCES})
 if(WIN32)
-  set(ADDITIONAL_LIBS ws2_32)
+  set(ADDITIONAL_LIBS ${ADDITIONAL_LIBS} ws2_32)
 endif(WIN32)
 
 target_link_libraries(vncclient