diff --git a/cmake/plugins.cmake b/cmake/plugins.cmake
index 87af1687a..7b75467da 100644
--- a/cmake/plugins.cmake
+++ b/cmake/plugins.cmake
@@ -61,9 +61,8 @@ FUNCTION(REGISTER_PLUGIN)
                        ${CC_BINARY_DIR}/win/${target}.rc
                        @ONLY)
         set(CC_PLUGIN_SOURCES ${CC_PLUGIN_SOURCES} ${CC_BINARY_DIR}/win/${target}.rc ${CC_SOURCE_DIR}/plugins/plugin.def)
-        MESSAGE(STATUS "PLugin sources: ${CC_PLUGIN_SOURCES}")
       endif()
-      add_library(${CC_PLUGIN_TARGET} MODULE ${CC_PLUGIN_SOURCES})
+      add_library(${CC_PLUGIN_TARGET} SHARED ${CC_PLUGIN_SOURCES})
       target_link_libraries(${CC_PLUGIN_TARGET} ${CC_PLUGIN_LIBRARIES})
       set_target_properties(${CC_PLUGIN_TARGET} PROPERTIES PREFIX "")
       set_target_properties(${CC_PLUGIN_TARGET} PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CC_BINARY_DIR}/plugins/lib")
diff --git a/plugins/auth/CMakeLists.txt b/plugins/auth/CMakeLists.txt
index 2dee24daf..1d40a34ec 100644
--- a/plugins/auth/CMakeLists.txt
+++ b/plugins/auth/CMakeLists.txt
@@ -38,7 +38,7 @@ IF(GSSAPI_SOURCES)
                   LIBRARIES ${GSSAPI_LIBS})
 ENDIF()
 
-IF(${WITH_SSL} STREQUAL "OPENSSL" OR "WIN32")
+IF(${WITH_SSL} STREQUAL "OPENSSL" OR ${WITH_SSL} STREQUAL "SCHANNEL")
   IF(WIN32)
     SET(SHA256_LIBS crypt32)
   ELSE()
diff --git a/win/packaging/CMakeLists.txt b/win/packaging/CMakeLists.txt
index 5fa8feb76..454dfe1a5 100644
--- a/win/packaging/CMakeLists.txt
+++ b/win/packaging/CMakeLists.txt
@@ -26,17 +26,15 @@ ENDIF()
 #
 # process dynamic plugins
 #
-FOREACH(plugin ${PLUGINS})
-  IF(${${plugin}_PLUGIN_TYPE} STREQUAL "DYNAMIC")
-    SET(TARGET ${${plugin}_PLUGIN_TARGET})
-    # Get dependencies
-    SET(DYNAMIC_TARGETS ${DYNAMIC_TARGETS} ${TARGET})
-    GET_PROPERTY(FILE TARGET ${TARGET} PROPERTY LOCATION)
-    #MESSAGE(STATUS "Location for ${TARGET}: ${DIRECTORY}")
-    # build file list
-    STRING(REPLACE "$(Configuration)" "RelWithDebInfo" FILE ${FILE})
-    SET(MARIADB_PLUGINS "${MARIADB_PLUGINS} <File Id=\"${TARGET}.dll\" Name=\"${TARGET}.dll\" DiskId=\"1\" Source=\"${FILE}\"/>\n")
-  ENDIF()
+FOREACH(plugin ${PLUGINS_DYNAMIC})
+  SET(TARGET ${plugin})
+  # Get dependencies
+  SET(DYNAMIC_TARGETS ${DYNAMIC_TARGETS} ${TARGET})
+  GET_PROPERTY(FILE TARGET ${TARGET} PROPERTY LOCATION)
+  MESSAGE(STATUS "Location for ${TARGET}: ${FILE}")
+  # build file list
+  STRING(REPLACE "$(Configuration)" "RelWithDebInfo" FILE ${FILE})
+  SET(MARIADB_PLUGINS "${MARIADB_PLUGINS} <File Id=\"${TARGET}.dll\" Name=\"${TARGET}.dll\" DiskId=\"1\" Source=\"${FILE}\"/>\n")
 ENDFOREACH()
 
 FOREACH(src ${WIX_INCLUDES})
diff --git a/win/resource.rc.in b/win/resource.rc.in
index ef928b9dc..399c88cb0 100644
--- a/win/resource.rc.in
+++ b/win/resource.rc.in
@@ -20,7 +20,7 @@ BEGIN
             VALUE "CompanyName", "MariaDB Corporation AB"
             VALUE "FileDescription", "@FILE_DESCRIPTION@"
             VALUE "FileVersion", "@CPACK_PACKAGE_VERSION_MAJOR@.@CPACK_PACKAGE_VERSION_MINOR@.@CPACK_PACKAGE_VERSION_PATCH@.@FILE_VERSION@"
-            VALUE "LegalCopyright", "2013-2015 MariaDB Corporation Ab"
+            VALUE "LegalCopyright", "2013-2018 MariaDB Corporation Ab"
             VALUE "ProductName", "MariaDB Connector/C"
             VALUE "ProductVersion", "@CPACK_PACKAGE_VERSION_MAJOR@.@CPACK_PACKAGE_VERSION_MINOR@.@CPACK_PACKAGE_VERSION_PATCH@"
             VALUE "OriginalFilename", "@ORIGINAL_FILE_NAME@"