diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index 658a370..78d33f8 100644
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.10)
 project(NativeVNC C CXX ASM)
 
 set(AVNC_EXTERN_DIR ${PROJECT_SOURCE_DIR}/../extern)
-set(BUILD_SHARED_LIBS OFF)
+set(BUILD_SHARED_LIBS OFF CACHE BOOL "Build shared Libs" FORCE)
 
 ###############################################################################
 # Utilities
diff --git a/build.gradle b/build.gradle
index 9e11199..d011eff 100644
--- a/build.gradle
+++ b/build.gradle
@@ -21,4 +21,23 @@ allprojects {
 
 task clean(type: Delete) {
     delete rootProject.buildDir
-}
\ No newline at end of file
+}
+
+/**
+ * Temporary workaround to enable CMake 3.10 compatibility for WolfSSL
+ */
+try {
+    def cl = file('extern/wolfssl/CMakeLists.txt')
+
+    def Fix1Old = 'cmake_minimum_required(VERSION 3.16)'
+    def Fix1New = 'cmake_minimum_required(VERSION 3.10)'
+    def Fix2Old = 'list(JOIN HEADER_EXCLUDE "|" EXCLUDED_HEADERS_REGEX)'
+    def Fix2New = 'string(REPLACE ";" "|" EXCLUDED_HEADERS_REGEX "${HEADER_EXCLUDE}")'
+
+    cl.text = cl.text.replace(Fix1Old, Fix1New).replace(Fix2Old, Fix2New)
+
+    gradle.buildFinished {
+        cl.text = cl.text.replace(Fix1New, Fix1Old).replace(Fix2New, Fix2Old)
+    }
+} catch (FileNotFoundException ignored) {
+}
diff --git a/extern/wolfssl b/extern/wolfssl
index 7e01af0..e6c07a2 160000
--- a/extern/wolfssl
+++ b/extern/wolfssl
@@ -1 +1 @@
-Subproject commit 7e01af012157bc20c840011a018619915380f05c
+Subproject commit e6c07a296d2996e8d5c3cc615dfc50013bbcc794