diff --git a/extra/aws_sdk/CMakeLists.txt b/extra/aws_sdk/CMakeLists.txt
index 7c4b8d8195c4a..f0e13e2b01053 100644
--- a/extra/aws_sdk/CMakeLists.txt
+++ b/extra/aws_sdk/CMakeLists.txt
@@ -34,7 +34,7 @@ ENDFOREACH()
 IF(CMAKE_VERSION LESS "3.0")
   SET(GIT_TAG "1.0.8")
 ELSE()
-  SET(GIT_TAG "1.8.29")
+  SET(GIT_TAG "1.11.155")
 ENDIF()
 
 IF(MSVC_CRT_TYPE MATCHES "/MD")
diff --git a/plugin/aws_key_management/CMakeLists.txt b/plugin/aws_key_management/CMakeLists.txt
index 3c6ca018273df..c08929c8fdeb8 100644
--- a/plugin/aws_key_management/CMakeLists.txt
+++ b/plugin/aws_key_management/CMakeLists.txt
@@ -9,9 +9,32 @@ ENDIF()
 MYSQL_ADD_PLUGIN(aws_key_management
   aws_key_management_plugin.cc
   COMPONENT aws-key-management)
+set(AWS_SDK_CPP_LIB_DIR ${CMAKE_BINARY_DIR}/extra/aws_sdk/aws_sdk_cpp/lib)
 
 IF(TARGET aws_key_management)
- USE_AWS_SDK_LIBS(aws_key_management kms)
+  target_link_libraries(aws_key_management
+  -Wl,--start-group
+    ${AWS_SDK_CPP_LIB_DIR}/libaws-c-common.a
+    ${AWS_SDK_CPP_LIB_DIR}/libaws-c-io.a
+    ${AWS_SDK_CPP_LIB_DIR}/libaws-c-http.a
+    ${AWS_SDK_CPP_LIB_DIR}/libaws-c-auth.a
+    ${AWS_SDK_CPP_LIB_DIR}/libaws-c-cal.a
+    ${AWS_SDK_CPP_LIB_DIR}/libaws-c-mqtt.a
+    ${AWS_SDK_CPP_LIB_DIR}/libaws-c-s3.a
+    ${AWS_SDK_CPP_LIB_DIR}/libaws-c-event-stream.a
+    ${AWS_SDK_CPP_LIB_DIR}/libaws-c-sdkutils.a
+    ${AWS_SDK_CPP_LIB_DIR}/libaws-c-compression.a
+    ${AWS_SDK_CPP_LIB_DIR}/libaws-checksums.a
+    ${AWS_SDK_CPP_LIB_DIR}/libaws-crt-cpp.a
+    ${AWS_SDK_CPP_LIB_DIR}/libaws-cpp-sdk-core.a
+    ${AWS_SDK_CPP_LIB_DIR}/libaws-cpp-sdk-kms.a
+    ${AWS_SDK_CPP_LIB_DIR}/libaws-cpp-sdk-logs.a
+    ${AWS_SDK_CPP_LIB_DIR}/libaws-cpp-sdk-sts.a
+    ${AWS_SDK_CPP_LIB_DIR}/libs2n.a
+  -Wl,--end-group
+    -lz
+  )
+  USE_AWS_SDK_LIBS(aws_key_management kms s3 sts logs )
 ENDIF()
 
 ADD_FEATURE_INFO(AWS_KEY_MANAGEMENT "ON" "AWS Encryption Key Management Plugin")
diff --git a/plugin/aws_key_management/aws_key_management_plugin.cc b/plugin/aws_key_management/aws_key_management_plugin.cc
index 18ec8f0c087b6..6bd88f46dc2d5 100644
--- a/plugin/aws_key_management/aws_key_management_plugin.cc
+++ b/plugin/aws_key_management/aws_key_management_plugin.cc
@@ -46,6 +46,9 @@
 #include <aws/kms/model/GenerateDataKeyWithoutPlaintextRequest.h>
 #include <aws/kms/model/GenerateDataKeyWithoutPlaintextResult.h>
 #include <aws/core/utils/Outcome.h>
+#include <aws/core/utils/logging/DefaultLogSystem.h>
+#include <aws/core/utils/logging/LogMacros.h>
+#include <aws/core/utils/logging/AWSLogging.h>
 
 using namespace std;
 using namespace Aws::KMS;