diff --git a/dev-libs/libcpuid/libcpuid-0.6.3~git.recipe b/dev-libs/libcpuid/libcpuid-0.6.5.recipe
similarity index 79%
rename from dev-libs/libcpuid/libcpuid-0.6.3~git.recipe
rename to dev-libs/libcpuid/libcpuid-0.6.5.recipe
index 5d70be914..35975e5ab 100644
--- a/dev-libs/libcpuid/libcpuid-0.6.3~git.recipe
+++ b/dev-libs/libcpuid/libcpuid-0.6.5.recipe
@@ -11,13 +11,10 @@ HOMEPAGE="http://libcpuid.sourceforge.net/"
 COPYRIGHT="2008  Veselin Georgiev"
 LICENSE="BSD (2-clause)"
 REVISION="1"
-srcGitRev="54ed9a0a17797982c82a7053d1386e42cecf4a9f"
-SOURCE_URI="https://github.com/anrieff/libcpuid/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="77b8ec25a7c9ba21d6d330f80a07d4fd35d276e14712e5fc5c138f14a8ec943a"
-SOURCE_FILENAME="libcpuid-v$portVersion.tar.gz"
-SOURCE_DIR="libcpuid-$srcGitRev"
-PATCHES="186.patch
-	libcpuid-$portVersion.patchset"
+SOURCE_URI="https://github.com/anrieff/libcpuid/archive/refs/tags/v$portVersion.tar.gz"
+CHECKSUM_SHA256="4d106d66d211f2bfaf876eb62c84d4b54664e1c2b47eb6138161d3c608c0bc5e"
+SOURCE_FILENAME="libcpuid-$portVersion.tar.gz"
+PATCHES="libcpuid-$portVersion.patchset"
 
 ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
@@ -56,12 +53,15 @@ BUILD_PREREQUIRES="
 	cmd:make
 	"
 
+TEST_REQUIRES="
+	cmd:python3
+	"
 
 BUILD()
 {
 	cmake -Bbuild -S. -DCMAKE_BUILD_TYPE=Release \
 		$cmakeDirArgs \
-		-DCMAKE_INSTALL_BINDIR=$commandBinDir
+		-DCMAKE_INSTALL_BINDIR=$commandBinDir -DLIBCPUID_TESTS=ON
 	make -C build
 }
 
@@ -79,5 +79,5 @@ INSTALL()
 
 TEST()
 {
-	make check
+	make -Cbuild test
 }
diff --git a/dev-libs/libcpuid/patches/186.patch b/dev-libs/libcpuid/patches/186.patch
deleted file mode 100644
index 2292c34e5..000000000
--- a/dev-libs/libcpuid/patches/186.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 6f4a723e6d44b44d1508c06d278d988522c04416 Mon Sep 17 00:00:00 2001
-From: Robert Kausch <robert.kausch@freac.org>
-Date: Fri, 10 Mar 2023 00:59:04 +0100
-Subject: [PATCH] Query CPU info at least once even if set_cpu_affinity() fails
-
----
- libcpuid/cpuid_main.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libcpuid/cpuid_main.c b/libcpuid/cpuid_main.c
-index 358dedd..568ce92 100644
---- a/libcpuid/cpuid_main.c
-+++ b/libcpuid/cpuid_main.c
-@@ -1076,7 +1076,7 @@ int cpuid_get_all_raw_data(struct cpu_raw_data_array_t* data)
- 	bool affinity_saved = save_cpu_affinity();
- 
- 	cpu_raw_data_array_t_constructor(data, true);
--	while (set_cpu_affinity(logical_cpu)) {
-+	while (set_cpu_affinity(logical_cpu) || logical_cpu == 0) {
- 		debugf(2, "Getting raw dump for logical CPU %i\n", logical_cpu);
- 		cpuid_grow_raw_data_array(data, logical_cpu + 1);
- 		raw_ptr = &data->raw[logical_cpu];
diff --git a/dev-libs/libcpuid/patches/libcpuid-0.6.3~git.patchset b/dev-libs/libcpuid/patches/libcpuid-0.6.5.patchset
similarity index 82%
rename from dev-libs/libcpuid/patches/libcpuid-0.6.3~git.patchset
rename to dev-libs/libcpuid/patches/libcpuid-0.6.5.patchset
index 5776731d6..0dbf19d21 100644
--- a/dev-libs/libcpuid/patches/libcpuid-0.6.3~git.patchset
+++ b/dev-libs/libcpuid/patches/libcpuid-0.6.5.patchset
@@ -1,14 +1,14 @@
-From 68d98bb470cf136dd39d19572ac3af758e7f8c65 Mon Sep 17 00:00:00 2001
+From 410d17211acc7d7bbb180b0547532349329b4bd1 Mon Sep 17 00:00:00 2001
 From: begasus <begasus@gmail.com>
 Date: Fri, 10 Mar 2023 19:10:44 +0100
-Subject: libcpuid, respect install paths given by $cmakeDirArgs
+Subject: libcpuid, respect install paths given by
 
 
 diff --git a/libcpuid/CMakeLists.txt b/libcpuid/CMakeLists.txt
-index d285f8b..2713766 100644
+index dcad1bf..ad877fe 100644
 --- a/libcpuid/CMakeLists.txt
 +++ b/libcpuid/CMakeLists.txt
-@@ -58,7 +58,7 @@ endif()
+@@ -60,7 +60,7 @@ endif()
  
  # Configuration
  set(generated_dir "${CMAKE_CURRENT_BINARY_DIR}/generated")
@@ -17,7 +17,7 @@ index d285f8b..2713766 100644
  set(version_config "${generated_dir}/${PROJECT_NAME}ConfigVersion.cmake")
  set(project_config "${generated_dir}/${PROJECT_NAME}Config.cmake")
  set(TARGETS_EXPORT_NAME "${PROJECT_NAME}Targets")
-@@ -78,11 +78,11 @@ configure_package_config_file("${PROJECT_SOURCE_DIR}/cmake/Config.cmake.in" "${p
+@@ -80,11 +80,11 @@ configure_package_config_file("${PROJECT_SOURCE_DIR}/cmake/Config.cmake.in" "${p
  install(
    TARGETS cpuid
    EXPORT "${TARGETS_EXPORT_NAME}"
@@ -35,5 +35,5 @@ index d285f8b..2713766 100644
  install(
    EXPORT "${TARGETS_EXPORT_NAME}"
 -- 
-2.37.3
+2.43.2