diff --git a/ports/clfft/fix-build.patch b/ports/clfft/fix-build.patch
new file mode 100644
index 0000000000..65c343945a
--- /dev/null
+++ b/ports/clfft/fix-build.patch
@@ -0,0 +1,25 @@
+diff --git a/src/library/generator.transpose.cpp b/src/library/generator.transpose.cpp
+index a04a43a..5c15882 100644
+--- a/src/library/generator.transpose.cpp
++++ b/src/library/generator.transpose.cpp
+@@ -1089,8 +1089,18 @@ clfftStatus genSwapKernelGeneral(const FFTGeneratedTransposeNonSquareAction::Sig
+ 
+ 	//std::string funcName = "swap_nonsquare_" + std::to_string(smaller_dim) + "_" + std::to_string(dim_ratio);
+ 	std::string funcName = "swap_nonsquare_";
+-	std::string smaller_dim_str = static_cast<std::ostringstream*>(&(std::ostringstream() << smaller_dim))->str();
+-	std::string dim_ratio_str = static_cast<std::ostringstream*>(&(std::ostringstream() << dim_ratio))->str();
++	std::string smaller_dim_str;
++	{
++		std::ostringstream oss;
++		oss << smaller_dim;
++		smaller_dim_str = oss.str();
++	}
++	std::string dim_ratio_str;
++	{
++		std::ostringstream oss;
++		oss << dim_ratio;
++		dim_ratio_str = oss.str();	
++	}
+ 	if(params.fft_N[0] > params.fft_N[1])
+ 		funcName = funcName + smaller_dim_str + "_" + dim_ratio_str;
+ 	else
diff --git a/ports/clfft/portfile.cmake b/ports/clfft/portfile.cmake
index bd52b12305..c45c30a9c9 100644
--- a/ports/clfft/portfile.cmake
+++ b/ports/clfft/portfile.cmake
@@ -6,6 +6,7 @@ vcpkg_from_github(
     HEAD_REF master
     PATCHES
         tweak-install.patch
+        fix-build.patch
 )
 
 vcpkg_cmake_configure(
diff --git a/ports/clfft/vcpkg.json b/ports/clfft/vcpkg.json
index 15886ab2ff..4eef7f9326 100644
--- a/ports/clfft/vcpkg.json
+++ b/ports/clfft/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "clfft",
   "version": "2.12.2",
-  "port-version": 5,
+  "port-version": 6,
   "description": "clFFT is an OpenCL 1.2 accelerated Fast Fourier Transform library.",
   "homepage": "https://github.com/clMathLibraries/clFFT",
   "license": "Apache-2.0",
diff --git a/versions/baseline.json b/versions/baseline.json
index 5c263b51fe..72b61df184 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1450,7 +1450,7 @@
     },
     "clfft": {
       "baseline": "2.12.2",
-      "port-version": 5
+      "port-version": 6
     },
     "cli": {
       "baseline": "2.0.2",
diff --git a/versions/c-/clfft.json b/versions/c-/clfft.json
index 33be216903..3efe934778 100644
--- a/versions/c-/clfft.json
+++ b/versions/c-/clfft.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "4acb8a5a455beee82cacccf5b72e6c6aa8d8c6a7",
+      "version": "2.12.2",
+      "port-version": 6
+    },
     {
       "git-tree": "b935ce5f9e186f9be8fe85d6d228043bede4cd04",
       "version": "2.12.2",