diff --git a/cmake/YosysVersion.cmake b/cmake/YosysVersion.cmake
index 2e231445c..da7aa0aab 100644
--- a/cmake/YosysVersion.cmake
+++ b/cmake/YosysVersion.cmake
@@ -70,6 +70,9 @@ function(yosys_extract_version)
 
 	# Build YOSYS_VERSION (just the version info).
 	set(YOSYS_VERSION "${YOSYS_VERSION_MAJOR}.${YOSYS_VERSION_MINOR}")
+	if (git_branch MATCHES "^release/v.+$")
+		set(git_distance 0)
+	endif()
 	if (git_distance STREQUAL "")
 		string(APPEND YOSYS_VERSION "+post")
 	else()
@@ -107,7 +110,7 @@ function(yosys_extract_version)
 		# Build YOSYS_ORIGIN_INFO (git repository origin and branch)
 		if (git_origin AND git_branch)
 			string(REGEX REPLACE "^https://|.git$" "" git_origin ${git_origin})
-			if (git_origin STREQUAL "github.com/YosysHQ/yosys" AND git_branch MATCHES "^HEAD|main|release/v.+$")
+			if (git_origin MATCHES "github\\.com[:/]YosysHQ/yosys$" AND git_branch MATCHES "^HEAD|main|release/v.+$")
 				# Nothing to highlight.
 				set(YOSYS_ORIGIN_INFO "")
 			else()
diff --git a/cmake/YosysVersionData.cmake b/cmake/YosysVersionData.cmake
index 4eb20ce5d..11ba96174 100644
--- a/cmake/YosysVersionData.cmake
+++ b/cmake/YosysVersionData.cmake
@@ -1,2 +1,2 @@
 set(YOSYS_VERSION_MAJOR 0)
-set(YOSYS_VERSION_MINOR 64)
+set(YOSYS_VERSION_MINOR 66)