diff --git a/ports/cctz/CMakeLists.txt b/ports/cctz/CMakeLists.txt
deleted file mode 100644
index e21b1ca680..0000000000
--- a/ports/cctz/CMakeLists.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-cmake_minimum_required(VERSION 3.8)
-project(cctz CXX)
-
-set(CMAKE_CXX_STANDARD 14)
-
-set(CMAKE_DEBUG_POSTFIX d)
-
-if(CMAKE_BUILD_TYPE STREQUAL "Release")
-    option(INSTALL_HEADERS "Install header files" ON)
-else()
-    option(INSTALL_HEADERS "Install header files" OFF)
-endif()
-
-find_package(benchmark CONFIG REQUIRED)
-
-file(GLOB SOURCES src/*.cc)
-list(FILTER SOURCES EXCLUDE REGEX "_test.cc$|benchmarks|_tool.cc$")
-
-file(GLOB HEADERS include/cctz/*.h)
-
-add_library(cctz ${SOURCES})
-target_include_directories(cctz PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> $<INSTALL_INTERFACE:include>)
-target_link_libraries(cctz PRIVATE benchmark::benchmark benchmark::benchmark_main)
-
-if(INSTALL_HEADERS)
-    install(FILES ${HEADERS} DESTINATION "include/cctz")
-endif()
-
-install(TARGETS cctz EXPORT unofficial-cctz-targets
-    RUNTIME DESTINATION bin
-    LIBRARY DESTINATION lib
-    ARCHIVE DESTINATION lib
-)
-
-install(
-    EXPORT unofficial-cctz-targets
-    FILE unofficial-cctz-config.cmake
-    NAMESPACE unofficial::
-    DESTINATION share/unofficial-cctz
-)
diff --git a/ports/cctz/portfile.cmake b/ports/cctz/portfile.cmake
index 3c229e7c87..d6562446b4 100644
--- a/ports/cctz/portfile.cmake
+++ b/ports/cctz/portfile.cmake
@@ -1,7 +1,3 @@
-if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
-    message(FATAL_ERROR "${PORT} does not currently support UWP")
-endif()
-
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
 vcpkg_from_github(
@@ -12,16 +8,17 @@ vcpkg_from_github(
     HEAD_REF master
 )
 
-file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
-
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DBUILD_TOOLS=OFF
+        -DBUILD_EXAMPLES=OFF
+        -DBUILD_TESTING=OFF
 )
 
 vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}")
 
-vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-cctz)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-vcpkg_copy_pdbs()
-
-file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
diff --git a/ports/cctz/vcpkg.json b/ports/cctz/vcpkg.json
index b8e7078a97..4d9fae6b6f 100644
--- a/ports/cctz/vcpkg.json
+++ b/ports/cctz/vcpkg.json
@@ -1,11 +1,10 @@
 {
   "name": "cctz",
   "version": "2.3",
-  "port-version": 5,
+  "port-version": 6,
   "description": "two libraries that cooperate with <chrono> to give C++ programmers all the necessary tools for computing with dates, times, and time zones in a simple and correct manner.",
   "homepage": "https://github.com/google/cctz",
   "dependencies": [
-    "benchmark",
     {
       "name": "vcpkg-cmake",
       "host": true
diff --git a/versions/baseline.json b/versions/baseline.json
index 3aee3cf66c..6a43c6ffcf 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1458,7 +1458,7 @@
     },
     "cctz": {
       "baseline": "2.3",
-      "port-version": 5
+      "port-version": 6
     },
     "cdt": {
       "baseline": "1.3.0",
diff --git a/versions/c-/cctz.json b/versions/c-/cctz.json
index cd559c1617..386c935057 100644
--- a/versions/c-/cctz.json
+++ b/versions/c-/cctz.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "02114f18edd1088204f039ab6bc662e23d2e4fcc",
+      "version": "2.3",
+      "port-version": 6
+    },
     {
       "git-tree": "4fb611037401f6c457c45f90d7a462fa13f6f1b1",
       "version": "2.3",