diff --git a/ports/capnproto/portfile.cmake b/ports/capnproto/portfile.cmake
index 2a3aecc137..62f7950eee 100644
--- a/ports/capnproto/portfile.cmake
+++ b/ports/capnproto/portfile.cmake
@@ -8,26 +8,33 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO capnproto/capnproto
-    REF 57a4ca5af5a7f55b768a9d9d6655250bffb1257f # v0.8.0
-    SHA512 6550356a40a13d41fbeef3887027de1134c4bc37e4d79435e67da1f65665f3856f7cd663be392135cf4a08fffcfd4e171614026c20bfc5727adfd624b2d33e35
+    REF v0.9.1
+    SHA512 BDC5960F26214139744D768CA4558B085E2D359C375A8849CA532A4C458A2DAF0EE1A1F4D00745DE5ABF353AA1E4084A2D85E5523006F23F591F21FAC2D847FD
     HEAD_REF master
 )
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    FEATURES
+        "openssl" OPENSSL_FEATURE
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DBUILD_TESTING=OFF
+        "-DWITH_OPENSSL=${OPENSSL_FEATURE}"
+)
 
-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/CapnProto)
+vcpkg_cmake_install()
+
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/CapnProto)
 
 vcpkg_copy_tools(TOOL_NAMES capnp capnpc-c++ capnpc-capnp AUTO_CLEAN)
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
 # Handle copyright
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/capnproto/vcpkg.json b/ports/capnproto/vcpkg.json
index 49b619ee57..0f65a54857 100644
--- a/ports/capnproto/vcpkg.json
+++ b/ports/capnproto/vcpkg.json
@@ -1,11 +1,26 @@
 {
   "name": "capnproto",
-  "version-string": "0.8.0",
-  "port-version": 2,
+  "version": "0.9.1",
   "description": "Data interchange format and capability-based RPC system",
   "homepage": "https://capnproto.org/",
   "supports": "!uwp & !((arm | arm64) & windows)",
   "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    },
     "zlib"
-  ]
+  ],
+  "features": {
+    "openssl": {
+      "description": "Build libkj-tls by linking against OpenSSL.",
+      "dependencies": [
+        "openssl"
+      ]
+    }
+  }
 }
diff --git a/versions/baseline.json b/versions/baseline.json
index b5d3618b90..7d7a31a1be 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1213,8 +1213,8 @@
       "port-version": 1
     },
     "capnproto": {
-      "baseline": "0.8.0",
-      "port-version": 2
+      "baseline": "0.9.1",
+      "port-version": 0
     },
     "capstone": {
       "baseline": "4.0.2",
diff --git a/versions/c-/capnproto.json b/versions/c-/capnproto.json
index 28f0e5e5a5..86c7d903bf 100644
--- a/versions/c-/capnproto.json
+++ b/versions/c-/capnproto.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "408771ff99776c9b25fd1121da589b720b7081c0",
+      "version": "0.9.1",
+      "port-version": 0
+    },
     {
       "git-tree": "3e33e9cf7ec5a8166ea3e33801645d731d119e25",
       "version-string": "0.8.0",