diff --git a/CMakeLists.txt b/CMakeLists.txt
index 928667710..c494479b6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -619,6 +619,10 @@ if(NOT MINIUPNP_FOUND)
 endif()
 
 if(NOT LIBZIP_FOUND OR NINTENDO_SWITCH)
+	cmake_policy(SET CMP0026 OLD)
+	set(zstd_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/core/deps/libchdr/deps/zstd-1.5.6/lib")
+	get_target_property(zstd_STATIC_LIBRARY libzstd_static LOCATION)
+
 	option(ENABLE_COMMONCRYPTO "Enable use of CommonCrypto" OFF)
 	option(ENABLE_GNUTLS "Enable use of GnuTLS" OFF)
 	option(ENABLE_MBEDTLS "Enable use of mbed TLS" OFF)
@@ -626,7 +630,7 @@ if(NOT LIBZIP_FOUND OR NINTENDO_SWITCH)
 	option(ENABLE_WINDOWS_CRYPTO "Enable use of Windows cryptography libraries" OFF)
 	option(ENABLE_BZIP2 "Enable use of BZip2" OFF)
 	option(ENABLE_LZMA "Enable use of LZMA" OFF)
-	option(ENABLE_ZSTD "Enable use of Zstandard" OFF)
+	option(ENABLE_ZSTD "Enable use of Zstandard" ON)
 	option(BUILD_TOOLS "Build tools in the src directory (zipcmp, zipmerge, ziptool)" OFF)
 	option(BUILD_REGRESS "Build regression tests" OFF)
 	option(BUILD_EXAMPLES "Build examples" OFF)