diff --git a/net-mgmt/thanos/Makefile b/net-mgmt/thanos/Makefile
index 5a21fa238794..50606aa09abb 100644
--- a/net-mgmt/thanos/Makefile
+++ b/net-mgmt/thanos/Makefile
@@ -1,36 +1,29 @@
 PORTNAME=	thanos
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.28.0
-PORTREVISION=	15
+DISTVERSION=	0.35.1
 CATEGORIES=	net-mgmt
 
 MAINTAINER=	ler@FreeBSD.org
 COMMENT=	Highly available Prometheus setup with long term storage capabilities
 WWW=		https://thanos.io/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-# fails to build on armv7/i386: pkg/store/cache/cache.go:166:22: constant 9223372036854775807 overflows int
-ONLY_FOR_ARCHS=	aarch64 amd64
-
 USES=		go:modules
 
-BUILD_DATE=	$$(date +%d-%B-%Y)
-
 GO_MODULE=	github.com/thanos-io/thanos
 GO_TARGET=	./cmd/${PORTNAME}
 GO_BUILDFLAGS=	-ldflags "\
-                -s -w \
+		-s -w \
 		-X github.com/prometheus/common/version.Version=${DISTVERSION} \
-		-X github.com/prometheus/common/version.Revision="31cacc4" \
+		-X github.com/prometheus/common/version.Revision="086a698" \
 		-X github.com/prometheus/common/version.Branch="master" \
 		-X github.com/prometheus/common/version.BuildUser=${USER} \
 		-X github.com/prometheus/common/version.BuildDate=${BUILD_DATE}"
 
-USE_GITHUB=	yes
-GH_ACCOUNT=	thanos-io
-
 PLIST_FILES=	bin/${PORTNAME}
 
+BUILD_DATE=	$$(date +%d-%B-%Y)
+
 .include <bsd.port.mk>
diff --git a/net-mgmt/thanos/distinfo b/net-mgmt/thanos/distinfo
index 73995356ceaa..f4c2de9c860f 100644
--- a/net-mgmt/thanos/distinfo
+++ b/net-mgmt/thanos/distinfo
@@ -1,7 +1,5 @@
-TIMESTAMP = 1661625331
-SHA256 (go/net-mgmt_thanos/thanos-io-thanos-v0.28.0_GH0/v0.28.0.mod) = fc321e4c0153606d3e3fa9792687030621e232f688e8237ca235d88fd78adb54
-SIZE (go/net-mgmt_thanos/thanos-io-thanos-v0.28.0_GH0/v0.28.0.mod) = 12886
-SHA256 (go/net-mgmt_thanos/thanos-io-thanos-v0.28.0_GH0/v0.28.0.zip) = d37b08da8b0ac6d600d5f94f4a3831bbc957f33b062f12ca30f79536ad9c7795
-SIZE (go/net-mgmt_thanos/thanos-io-thanos-v0.28.0_GH0/v0.28.0.zip) = 25835507
-SHA256 (go/net-mgmt_thanos/thanos-io-thanos-v0.28.0_GH0/thanos-io-thanos-v0.28.0_GH0.tar.gz) = 095466b601fbe5c0323beb4b8d93970d6bcb8b2f9607cd5da9514c2d4207b072
-SIZE (go/net-mgmt_thanos/thanos-io-thanos-v0.28.0_GH0/thanos-io-thanos-v0.28.0_GH0.tar.gz) = 25687061
+TIMESTAMP = 1717670321
+SHA256 (go/net-mgmt_thanos/thanos-v0.35.1/v0.35.1.mod) = a5bb197df7e1170a6457a5da5fdfd76f7b82143a0d4b63498f0584617b4e7c32
+SIZE (go/net-mgmt_thanos/thanos-v0.35.1/v0.35.1.mod) = 14205
+SHA256 (go/net-mgmt_thanos/thanos-v0.35.1/v0.35.1.zip) = 08fe7d03590a53e6c67373189ce5327f1b8bdd8338ff6d5c36f05c32766db726
+SIZE (go/net-mgmt_thanos/thanos-v0.35.1/v0.35.1.zip) = 27057328
diff --git a/net-mgmt/thanos/pkg-descr b/net-mgmt/thanos/pkg-descr
index 3672b1d33a0b..849253142934 100644
--- a/net-mgmt/thanos/pkg-descr
+++ b/net-mgmt/thanos/pkg-descr
@@ -1,8 +1,10 @@
 Thanos is a set of components that can be composed into a highly available
-metric system with unlimited storage capacity, which can be added seamlessly on
-top of existing Prometheus deployments.
+metric system with unlimited storage capacity, which can be added seamlessly
+on top of existing Prometheus deployments.
 
 Thanos leverages the Prometheus 2.0 storage format to cost-efficiently store
 historical metric data in any object storage while retaining fast query
-latencies. Additionally, it provides a global query view across all Prometheus
+latencies.
+
+Additionally, it provides a global query view across all Prometheus
 installations and can merge data from Prometheus HA pairs on the fly.