diff --git a/common/shlibs b/common/shlibs
index a05844bbeb..b750ad9ee2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3630,7 +3630,7 @@ libcaf_openssl.so.0.17.6 zeek-3.2.0_1
 libbinpac.so.0 zeek-3.1.1_1
 libllhttp.so.1 llhttp-1.0.1_1
 libpinyin.so.13 libpinyin-2.2.1_1
-libuhd.so.3.15.0 uhd-3.15.0.0_1
+libuhd.so.4.0.0 uhd-4.0.0.0_1
 libeditline.so.1 editline-1.16.0_1
 libgnuradio-rds.so.1 gnuradio-rds-3.8.0_1
 libgnuradio-nrsc5-1.0.0git.so.0.0.0 gnuradio-nrsc5-1.0.0_1
diff --git a/srcpkgs/uhd/template b/srcpkgs/uhd/template
index b0484732ea..45dc39c6e7 100644
--- a/srcpkgs/uhd/template
+++ b/srcpkgs/uhd/template
@@ -1,25 +1,30 @@
 # Template file for 'uhd'
 pkgname=uhd
-version=3.15.0.0
+version=4.0.0.0
 revision=1
-wrksrc="${pkgname}-${version}"
 build_wrksrc=host
 build_style=cmake
+configure_args="-DCMAKE_BUILD_TYPE=None"
 hostmakedepends="doxygen pkg-config python3-Mako python3-numpy python3-requests"
 makedepends="libusb-devel boost-devel"
 short_desc="Ettus USRP Hardware driver library"
 maintainer="Remi Pommarel <repk@triplefau.lt>"
 license="GPL-3.0-or-later"
-homepage="https://files.ettus.com/"
+homepage="https://files.ettus.com/manual/"
 changelog="https://raw.githubusercontent.com/EttusResearch/uhd/master/CHANGELOG"
 distfiles="https://github.com/EttusResearch/uhd/archive/v${version}.tar.gz"
-checksum=eed4a77d75faafff56be78985950039f8d9d1eb9fcbd58b8862e481dd49825cd
-python_version=2 #unverified
+checksum=4f3513c43edf0178391ed5755266864532716b8b503bcfb9a983ae6256c51b14
+python_version=3
 
 case "${XBPS_TARGET_MACHINE}" in
-	arm*) configure_args="-DNEON_SIMD_ENABLE=OFF"
+	arm*) configure_args+=" -DNEON_SIMD_ENABLE=OFF"
 esac
 
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic"
+fi
+
 post_install() {
 	rm -rf ${DESTDIR}/usr/lib/uhd/tests
 }
@@ -31,7 +36,6 @@ uhd-devel_package() {
 		vmove usr/include
 		vmove usr/share/man/man1
 		vmove usr/lib/pkgconfig
-		vmove usr/lib/uhd/examples
 		vmove usr/lib/cmake
 		vmove "usr/lib/*.so"
 	}
@@ -39,7 +43,6 @@ uhd-devel_package() {
 
 uhd-doc_package() {
 	short_desc+=" - doc files"
-	archs=noarch
 	pkg_install() {
 		vmove usr/share/doc
 	}