diff --git a/common/shlibs b/common/shlibs
index aa4cdc26e7d..c7a1c68adcd 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -675,6 +675,7 @@ libatasmart.so.4 libatasmart-0.17_1
 libsgutils2.so.2 libsgutils-1.42_1
 liblvm2app.so.2.2 liblvm2app-2.02.54_1
 libcpufreq.so.0 libcpufreq-007_1
+libcpuid.so.14 libcpuid-0.4.0_1
 libgucharmap_2_90.so.7 gucharmap-3.0.0_1
 libgphoto2.so.6 libgphoto2-2.5.7_1
 libgphoto2_port.so.12 libgphoto2-2.5.7_1
diff --git a/srcpkgs/CPU-X/template b/srcpkgs/CPU-X/template
new file mode 100644
index 00000000000..3f7f764dcee
--- /dev/null
+++ b/srcpkgs/CPU-X/template
@@ -0,0 +1,24 @@
+# Template file for 'CPU-X'
+pkgname=CPU-X
+version=3.2.3
+revision=1
+only_for_archs="i686 x86_64 i686-musl x86_64-musl"
+build_style=cmake
+build_options="gtk3"
+build_options_default="gtk3"
+hostmakedepends="nasm pkg-config"
+makedepends="libcpuid-devel libcurl-devel ncurses-devel pciutils-devel
+ procps-ng-devel $(vopt_if gtk3 'gtk+3-devel')"
+short_desc="Free software that gathers information on CPU, motherboard and more"
+maintainer="cr6git <quark6@protonmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://x0rg.github.io/CPU-X/"
+distfiles="https://github.com/X0rg/CPU-X/archive/v${version}.tar.gz"
+checksum=4c11b3e3632870e9af81c5c0fa642edff8dd4622a172bbb788c4e6be595eb014
+
+case $XBPS_TARGET_MACHINE in
+	*-musl)
+		makedepends+=" libexecinfo-devel"
+		LDFLAGS="-lexecinfo"
+	;;
+esac
diff --git a/srcpkgs/libcpuid-devel b/srcpkgs/libcpuid-devel
new file mode 120000
index 00000000000..75598a1b243
--- /dev/null
+++ b/srcpkgs/libcpuid-devel
@@ -0,0 +1 @@
+libcpuid
\ No newline at end of file
diff --git a/srcpkgs/libcpuid/template b/srcpkgs/libcpuid/template
new file mode 100644
index 00000000000..7b98b8a049a
--- /dev/null
+++ b/srcpkgs/libcpuid/template
@@ -0,0 +1,27 @@
+# Template file for 'libcpuid'
+pkgname=libcpuid
+version=0.4.0
+revision=1
+only_for_archs="i686 x86_64 i686-musl x86_64-musl"
+build_style=gnu-configure
+short_desc="Small C library for x86 CPU detection and feature extraction"
+maintainer="cr6git <quark6@protonmail.com>"
+license="BSD-2-Clause"
+homepage="https://github.com/anrieff/libcpuid"
+distfiles="https://github.com/anrieff/libcpuid/releases/download/v${version}/libcpuid-${version}.tar.gz"
+checksum=9ad4d85d7a1151b542e1d032db21e72f1530430c83f1428f80bf07ac6239b24d
+
+post_install() {
+	vlicense COPYING
+}
+
+libcpuid-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}