diff --git a/dev-build/cmake/cmake-3.31.5.recipe b/dev-build/cmake/cmake3-3.31.9.recipe
similarity index 97%
rename from dev-build/cmake/cmake-3.31.5.recipe
rename to dev-build/cmake/cmake3-3.31.9.recipe
index e5aec3e47..63252f7be 100644
--- a/dev-build/cmake/cmake-3.31.5.recipe
+++ b/dev-build/cmake/cmake3-3.31.9.recipe
@@ -9,16 +9,17 @@ COPYRIGHT="2002-2025 Kitware, Inc., Insight Consortium"
 LICENSE="CMake"
 REVISION="1"
 SOURCE_URI="https://cmake.org/files/v${portVersion%.*}/cmake-$portVersion.tar.gz"
-CHECKSUM_SHA256="66fb53a145648be56b46fa9e8ccade3a4d0dfc92e401e52ce76bdad1fea43d27"
+CHECKSUM_SHA256="5d4fdec04247ca8a8e8f63692f0d0f1e9d6d082a2bdd008dff8ab3ba7215aa83"
+SOURCE_DIR="cmake-$portVersion"
 PATCHES="cmake-$portVersion.patchset"
 
-ARCHITECTURES="?all !x86_gcc2"
+ARCHITECTURES="?all !x86_gcc2 x86_64"
 SECONDARY_ARCHITECTURES="?x86"
 
 portVersionCompat="$portVersion compat >= ${portVersion%%.*}"
 
 PROVIDES="
-	cmake$secondaryArchSuffix = $portVersionCompat
+	cmake3$secondaryArchSuffix = $portVersionCompat
 	cmd:ccmake = $portVersionCompat
 	cmd:cmake = $portVersionCompat
 	cmd:cpack = $portVersionCompat
@@ -43,6 +44,9 @@ REQUIRES="
 #	lib:libnghttp2$secondaryArchSuffix
 #	lib:libzstd$secondaryArchSuffix
 	"
+CONFLICTS="
+	cmake$secondaryArchSuffix
+	"
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
@@ -75,7 +79,7 @@ BUILD_PREREQUIRES="
 	cmd:which
 	"
 
-defineDebugInfoPackage cmake$secondaryArchSuffix \
+defineDebugInfoPackage cmake3$secondaryArchSuffix \
 	$prefix/bin/ccmake \
 	$prefix/bin/cmake \
 	$prefix/bin/cpack \
diff --git a/dev-build/cmake/cmake_gui-3.31.5.recipe b/dev-build/cmake/cmake3_gui-3.31.9.recipe
similarity index 95%
rename from dev-build/cmake/cmake_gui-3.31.5.recipe
rename to dev-build/cmake/cmake3_gui-3.31.9.recipe
index de9845d74..f5c557d4f 100644
--- a/dev-build/cmake/cmake_gui-3.31.5.recipe
+++ b/dev-build/cmake/cmake3_gui-3.31.9.recipe
@@ -12,7 +12,7 @@ COPYRIGHT="2002-2025 Kitware, Inc., Insight Consortium"
 LICENSE="CMake"
 REVISION="1"
 SOURCE_URI="https://cmake.org/files/v${portVersion%.*}/cmake-$portVersion.tar.gz"
-CHECKSUM_SHA256="66fb53a145648be56b46fa9e8ccade3a4d0dfc92e401e52ce76bdad1fea43d27"
+CHECKSUM_SHA256="5d4fdec04247ca8a8e8f63692f0d0f1e9d6d082a2bdd008dff8ab3ba7215aa83"
 SOURCE_DIR="cmake-$portVersion"
 PATCHES="cmake-$portVersion.patchset"
 ADDITIONAL_FILES="cmake.rdef.in"
@@ -23,12 +23,12 @@ SECONDARY_ARCHITECTURES="?x86"
 portVersionCompat="$portVersion compat >= ${portVersion%%.*}"
 
 PROVIDES="
-	cmake_gui$secondaryArchSuffix = $portVersion
+	cmake3_gui$secondaryArchSuffix = $portVersion
 	cmd:cmake_gui = $portVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
-	cmake$secondaryArchSuffix
+	cmake3$secondaryArchSuffix
 	lib:libarchive$secondaryArchSuffix
 	lib:libcppdap$secondaryArchSuffix
 	lib:libcurl$secondaryArchSuffix
@@ -75,7 +75,7 @@ BUILD_PREREQUIRES="
 	cmd:sed
 	"
 
-defineDebugInfoPackage cmake_gui$secondaryArchSuffix \
+defineDebugInfoPackage cmake3_gui$secondaryArchSuffix \
 	$prefix/bin/cmake-gui
 
 BUILD()
diff --git a/dev-build/cmake/patches/cmake-3.31.5.patchset b/dev-build/cmake/patches/cmake-3.31.9.patchset
similarity index 100%
rename from dev-build/cmake/patches/cmake-3.31.5.patchset
rename to dev-build/cmake/patches/cmake-3.31.9.patchset