diff --git a/CMakeLists.txt b/CMakeLists.txt
index 891858ac4c..b5bee69c93 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -133,7 +133,10 @@ if (MSVC)
     # Set PCAP_ROOT_DIR to point at the installation from vcpkg. A later call
     # to FindPCAP.cmake will fill in the rest of the necessary variables.
     if (NOT PCAP_ROOT_DIR)
-        set(PCAP_ROOT_DIR ${VCPKG_INSTALLED_DIR}/x64-windows-static)
+        set(PCAP_ROOT_DIR ${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET})
+    else ()
+        unset(PCAP_INCLUDE_DIR CACHE)
+        unset(PCAP_LIBRARY CACHE)
     endif ()
 
     set(LIBPCAP_PCAP_COMPILE_NOPCAP_HAS_ERROR_PARAMETER false)
diff --git a/cmake b/cmake
index 50e3d75cc2..1d793368ac 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit 50e3d75cc2fd06e5d274244aba0d40db7d9a960b
+Subproject commit 1d793368ac4d4b06cb2c9c716e5477dbf3c2a8e3
diff --git a/doc b/doc
index 859234548b..126bdb2250 160000
--- a/doc
+++ b/doc
@@ -1 +1 @@
-Subproject commit 859234548b54dc271f42355206080ab838d00ed3
+Subproject commit 126bdb2250266064135e9aa5ab9b45ab390c4651