diff --git a/security/xhash/Makefile b/security/xhash/Makefile
index 0d1a4cf0feb3..37b411cf42bd 100644
--- a/security/xhash/Makefile
+++ b/security/xhash/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	xhash
 DISTVERSIONPREFIX=	v
-DISTVERSION=	3.5.3
-PORTREVISION=	5
+DISTVERSION=	3.6.3
 CATEGORIES=	security
 
 MAINTAINER=	rbranco@suse.com
@@ -11,17 +10,23 @@ WWW=		https://github.com/ricardobranco777/xhash/
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		go:modules,1.23
+USES=		go:modules,1.24
 USE_GITHUB=	yes
 GH_ACCOUNT=	ricardobranco777
-GH_TUPLE=	\
-		golang:crypto:v0.28.0:golang_crypto/vendor/golang.org/x/crypto \
-		golang:sync:v0.8.0:golang_sync/vendor/golang.org/x/sync \
-		golang:sys:v0.26.0:golang_sys/vendor/golang.org/x/sys \
+GH_TUPLE=	golang:crypto:v0.37.0:golang_crypto/vendor/golang.org/x/crypto \
+		golang:sync:v0.13.0:golang_sync/vendor/golang.org/x/sync \
+		golang:sys:v0.32.0:golang_sys/vendor/golang.org/x/sys \
 		klauspost:cpuid:v2.0.12:klauspost_cpuid_v2/vendor/github.com/klauspost/cpuid/v2 \
-		spf13:pflag:v1.0.5:spf13_pflag/vendor/github.com/spf13/pflag \
+		spf13:pflag:v1.0.6:spf13_pflag/vendor/github.com/spf13/pflag \
 		zeebo:blake3:v0.2.4:zeebo_blake3/vendor/github.com/zeebo/blake3
 
-PLIST_FILES=	bin/xhash
+PLIST_FILES=	bin/xhash \
+		share/man/man1/xhash.1.gz
+
+post-extract:
+	@${CP} ${FILESDIR}/modules.txt ${WRKSRC}/vendor
+
+post-install:
+	${INSTALL_MAN} ${WRKSRC}/xhash.1 ${STAGEDIR}${PREFIX}/share/man/man1/
 
 .include <bsd.port.mk>
diff --git a/security/xhash/distinfo b/security/xhash/distinfo
index 0c46d1ddbf42..3b4ecc64e6a0 100644
--- a/security/xhash/distinfo
+++ b/security/xhash/distinfo
@@ -1,15 +1,15 @@
-TIMESTAMP = 1730393238
-SHA256 (ricardobranco777-xhash-v3.5.3_GH0.tar.gz) = 9b037a90cf94545b50c7020eb8597457ce552905672a7ef6fb543cbc15119f97
-SIZE (ricardobranco777-xhash-v3.5.3_GH0.tar.gz) = 14789
-SHA256 (golang-crypto-v0.28.0_GH0.tar.gz) = 4c84b1d8249c6f68b6a572764667b1d24650821359cab28c525eec95f29eaae8
-SIZE (golang-crypto-v0.28.0_GH0.tar.gz) = 1845117
-SHA256 (golang-sync-v0.8.0_GH0.tar.gz) = 1872b89e8bf234d4c65edca0bf7c7fd6c414cf74a5a9e10463eb2483cf7b361f
-SIZE (golang-sync-v0.8.0_GH0.tar.gz) = 18181
-SHA256 (golang-sys-v0.26.0_GH0.tar.gz) = 584b9e1f84f2edfddedc60727a0296b053688fb30c4097490942981283c683e4
-SIZE (golang-sys-v0.26.0_GH0.tar.gz) = 1508756
+TIMESTAMP = 1745093911
+SHA256 (ricardobranco777-xhash-v3.6.3_GH0.tar.gz) = 7340ca6d9cd4a744f1646d57cdfe029d2e67dd14b6c5ec8bdd1d9aa16420ddee
+SIZE (ricardobranco777-xhash-v3.6.3_GH0.tar.gz) = 16157
+SHA256 (golang-crypto-v0.37.0_GH0.tar.gz) = efc47fd29f232cc4e82f9de57a2213e6426fc2ee2d79c8ae545597c2e16ffdf7
+SIZE (golang-crypto-v0.37.0_GH0.tar.gz) = 1850383
+SHA256 (golang-sync-v0.13.0_GH0.tar.gz) = 32cb60ee6f4c884be8923c7ea19a518be6d1de6ba31baa6cee22a71f81ad612d
+SIZE (golang-sync-v0.13.0_GH0.tar.gz) = 17964
+SHA256 (golang-sys-v0.32.0_GH0.tar.gz) = 6413352edb2789896c7aaf19d653542317667b5152e52169827059ad4a88ad94
+SIZE (golang-sys-v0.32.0_GH0.tar.gz) = 1525988
 SHA256 (klauspost-cpuid-v2.0.12_GH0.tar.gz) = ac723eecde24ff08a2fa4b3989b602ab2ecd607f132845b66c26aae896f7130a
 SIZE (klauspost-cpuid-v2.0.12_GH0.tar.gz) = 343262
-SHA256 (spf13-pflag-v1.0.5_GH0.tar.gz) = 9a2cae1f8e8ab0d2cc8ebe468e871af28d9ac0962cf0520999e3ba85f0c7b808
-SIZE (spf13-pflag-v1.0.5_GH0.tar.gz) = 50796
+SHA256 (spf13-pflag-v1.0.6_GH0.tar.gz) = b6beba1d0a8ce6e0827567931ff9b1b1c93b0fb4b091e825aa09bf0310664ff7
+SIZE (spf13-pflag-v1.0.6_GH0.tar.gz) = 52840
 SHA256 (zeebo-blake3-v0.2.4_GH0.tar.gz) = 382191dfcc6086b8a4679b98ad365c1bfb9674cf9fe2142b049f4c82cc240d51
 SIZE (zeebo-blake3-v0.2.4_GH0.tar.gz) = 112040
diff --git a/security/xhash/files/modules.txt b/security/xhash/files/modules.txt
new file mode 100644
index 000000000000..b6597cb1473e
--- /dev/null
+++ b/security/xhash/files/modules.txt
@@ -0,0 +1,29 @@
+# github.com/klauspost/cpuid/v2 v2.0.12
+## explicit; go 1.15
+github.com/klauspost/cpuid/v2
+# github.com/spf13/pflag v1.0.6
+## explicit; go 1.12
+github.com/spf13/pflag
+# github.com/zeebo/blake3 v0.2.4
+## explicit; go 1.18
+github.com/zeebo/blake3
+github.com/zeebo/blake3/internal/alg
+github.com/zeebo/blake3/internal/alg/compress
+github.com/zeebo/blake3/internal/alg/compress/compress_pure
+github.com/zeebo/blake3/internal/alg/compress/compress_sse41
+github.com/zeebo/blake3/internal/alg/hash
+github.com/zeebo/blake3/internal/alg/hash/hash_avx2
+github.com/zeebo/blake3/internal/alg/hash/hash_pure
+github.com/zeebo/blake3/internal/consts
+github.com/zeebo/blake3/internal/utils
+# golang.org/x/crypto v0.37.0
+## explicit; go 1.23.0
+golang.org/x/crypto/blake2b
+golang.org/x/crypto/blake2s
+golang.org/x/crypto/sha3
+# golang.org/x/sync v0.13.0
+## explicit; go 1.23.0
+golang.org/x/sync/errgroup
+# golang.org/x/sys v0.32.0
+## explicit; go 1.23.0
+golang.org/x/sys/cpu