diff --git a/ports/clblas/portfile.cmake b/ports/clblas/portfile.cmake
index eeeb71c3f75..b173c90bdba 100644
--- a/ports/clblas/portfile.cmake
+++ b/ports/clblas/portfile.cmake
@@ -11,13 +11,12 @@ vcpkg_from_github(
 
 # v2.12 has a very old FindOpenCL.cmake using OPENCL_ vs. OpenCL_ var names
 # conflicting with the built-in, more modern FindOpenCL.cmake
-file(REMOVE ${SOURCE_PATH}/src/FindOpenCL.cmake)
+file(REMOVE "${SOURCE_PATH}/src/FindOpenCL.cmake")
 
 vcpkg_find_acquire_program(PYTHON3)
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}/src
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}/src"
     OPTIONS
         -DBUILD_TEST=OFF
         -DBUILD_KTEST=OFF
@@ -25,26 +24,27 @@ vcpkg_configure_cmake(
         -DPYTHON_EXECUTABLE=${PYTHON3}
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
-    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
 endif()
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
 if(VCPKG_TARGET_IS_WINDOWS)
     file(REMOVE
-        ${CURRENT_PACKAGES_DIR}/debug/bin/clBLAS-tune.pdb
-        ${CURRENT_PACKAGES_DIR}/debug/bin/clBLAS-tune.exe
-        ${CURRENT_PACKAGES_DIR}/bin/clBLAS-tune.exe
+        "${CURRENT_PACKAGES_DIR}/debug/bin/clBLAS-tune.pdb"
+        "${CURRENT_PACKAGES_DIR}/debug/bin/clBLAS-tune.exe"
+        "${CURRENT_PACKAGES_DIR}/bin/clBLAS-tune.exe"
     )
 endif()
 
 if(VCPKG_TARGET_IS_WINDOWS)
-    vcpkg_fixup_cmake_targets(CONFIG_PATH CMake)
+    vcpkg_cmake_config_fixup(CONFIG_PATH CMake)
 else()
-    vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/clBLAS)
+    vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/clBLAS)
 endif()
 
 vcpkg_copy_pdbs()
+vcpkg_fixup_pkgconfig()
 
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION ${CURRENT_PACKAGES_DIR}/share/clblas RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/clblas" RENAME copyright)
diff --git a/ports/clblas/vcpkg.json b/ports/clblas/vcpkg.json
index 975a0982bc7..ee4c8bf7616 100644
--- a/ports/clblas/vcpkg.json
+++ b/ports/clblas/vcpkg.json
@@ -1,9 +1,17 @@
 {
   "name": "clblas",
-  "version-string": "2.12",
-  "port-version": 5,
+  "version": "2.12",
+  "port-version": 6,
   "description": "clBLAS is an OpenCL 1.2 accelerated BLAS (Basic Linear Algebra Subsystem) library.",
   "dependencies": [
-    "opencl"
+    "opencl",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
   ]
 }
diff --git a/versions/baseline.json b/versions/baseline.json
index b855d34e20e..f357d84f89d 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1382,7 +1382,7 @@
     },
     "clblas": {
       "baseline": "2.12",
-      "port-version": 5
+      "port-version": 6
     },
     "clblast": {
       "baseline": "1.5.2",
diff --git a/versions/c-/clblas.json b/versions/c-/clblas.json
index edd860f8724..7b8c3594f75 100644
--- a/versions/c-/clblas.json
+++ b/versions/c-/clblas.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "a94b503ed4a4a74fa316ac65c363968092a0b026",
+      "version": "2.12",
+      "port-version": 6
+    },
     {
       "git-tree": "0972ab18d9864a174d8c9acb7cf1add27c6a4ce2",
       "version-string": "2.12",