diff --git a/cmake/modules/civetweb.cmake b/cmake/modules/civetweb.cmake
index 43294436..479410fb 100644
--- a/cmake/modules/civetweb.cmake
+++ b/cmake/modules/civetweb.cmake
@@ -16,21 +16,37 @@ set(CIVETWEB_LIB "${CIVETWEB_SRC}/install/lib/libcivetweb.a")
 SET(CIVETWEB_CPP_LIB "${CIVETWEB_SRC}/install/lib/libcivetweb-cpp.a")
 set(CIVETWEB_INCLUDE_DIR "${CIVETWEB_SRC}/install/include")
 message(STATUS "Using bundled civetweb in '${CIVETWEB_SRC}'")
-ExternalProject_Add(
-        civetweb
-        DEPENDS openssl
-        URL "https://github.com/civetweb/civetweb/archive/v1.15.tar.gz"
-        URL_HASH "SHA256=90a533422944ab327a4fbb9969f0845d0dba05354f9cacce3a5005fa59f593b9"
-        INSTALL_DIR ${CIVETWEB_SRC}/install
-        CMAKE_ARGS
-        -DBUILD_TESTING=off
-        -DCIVETWEB_BUILD_TESTING=off
-        -DCIVETWEB_ENABLE_CXX=on
-        -DCIVETWEB_ENABLE_SERVER_EXECUTABLE=off
-        -DCIVETWEB_ENABLE_SSL_DYNAMIC_LOADING=off
-        -DCIVETWEB_SERVE_NO_FILES=on
-        -DCMAKE_INSTALL_PREFIX=${CIVETWEB_SRC}/install
-        -DOPENSSL_INCLUDE_DIR=${OPENSSL_INCLUDE_DIR}
-        -DOPENSSL_LIBRARIES=${OPENSSL_LIBRARIES}
-        BUILD_BYPRODUCTS ${CIVETWEB_LIB} ${CIVETWEB_CPP_LIB}
-        PATCH_COMMAND patch -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/civetweb/patch/civetweb.patch)
\ No newline at end of file
+if (USE_BUNDLED_OPENSSL)
+    ExternalProject_Add(
+            civetweb
+            DEPENDS openssl
+            URL "https://github.com/civetweb/civetweb/archive/v1.15.tar.gz"
+            URL_HASH "SHA256=90a533422944ab327a4fbb9969f0845d0dba05354f9cacce3a5005fa59f593b9"
+            INSTALL_DIR ${CIVETWEB_SRC}/install
+            CMAKE_ARGS
+            -DBUILD_TESTING=off
+            -DCIVETWEB_BUILD_TESTING=off
+            -DCIVETWEB_ENABLE_CXX=on
+            -DCIVETWEB_ENABLE_SERVER_EXECUTABLE=off
+            -DCIVETWEB_ENABLE_SSL_DYNAMIC_LOADING=off
+            -DCIVETWEB_SERVE_NO_FILES=on
+            -DCMAKE_INSTALL_PREFIX=${CIVETWEB_SRC}/install
+            -DOPENSSL_ROOT_DIR:PATH=${OPENSSL_INSTALL_DIR}
+            -DOPENSSL_USE_STATIC_LIBS:BOOL=TRUE
+            BUILD_BYPRODUCTS ${CIVETWEB_LIB} ${CIVETWEB_CPP_LIB})
+else()
+    ExternalProject_Add(
+            civetweb
+            URL "https://github.com/civetweb/civetweb/archive/v1.15.tar.gz"
+            URL_HASH "SHA256=90a533422944ab327a4fbb9969f0845d0dba05354f9cacce3a5005fa59f593b9"
+            INSTALL_DIR ${CIVETWEB_SRC}/install
+            CMAKE_ARGS
+            -DBUILD_TESTING=off
+            -DCIVETWEB_BUILD_TESTING=off
+            -DCIVETWEB_ENABLE_CXX=on
+            -DCIVETWEB_ENABLE_SERVER_EXECUTABLE=off
+            -DCIVETWEB_ENABLE_SSL_DYNAMIC_LOADING=off
+            -DCIVETWEB_SERVE_NO_FILES=on
+            -DCMAKE_INSTALL_PREFIX=${CIVETWEB_SRC}/install
+            BUILD_BYPRODUCTS ${CIVETWEB_LIB} ${CIVETWEB_CPP_LIB})
+endif()
\ No newline at end of file
diff --git a/cmake/modules/civetweb/patch/civetweb.patch b/cmake/modules/civetweb/patch/civetweb.patch
deleted file mode 100644
index 66115aee..00000000
--- a/cmake/modules/civetweb/patch/civetweb.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 43f3a77e..92664b79 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -53,7 +53,10 @@ if (CIVETWEB_ENABLE_SSL)
-       target_link_libraries(civetweb-c-library -ldl)
-     endif()
-   else()
--    find_package(OpenSSL)
-+    # Let it use our own provided openssl
-+    if (NOT OPENSSL_INCLUDE_DIR)
-+      find_package(OpenSSL)
-+    endif()
-     include_directories(${OPENSSL_INCLUDE_DIR})
-     message(STATUS "OpenSSL include directory: ${OPENSSL_INCLUDE_DIR}")
-     target_link_libraries(civetweb-c-library ${OPENSSL_LIBRARIES})