diff --git a/net-mgmt/prometheus3/Makefile b/net-mgmt/prometheus3/Makefile
index 6848b982dee5..6dbcd440107d 100644
--- a/net-mgmt/prometheus3/Makefile
+++ b/net-mgmt/prometheus3/Makefile
@@ -1,81 +1,80 @@
 PORTNAME=	prometheus
 DISTVERSIONPREFIX=	v
-DISTVERSION=	3.5.0
-PORTREVISION=	2
+DISTVERSION=	3.6.0
 CATEGORIES=	net-mgmt
 MASTER_SITES=	https://raw.githubusercontent.com/${GH_ACCOUNT}/${GH_PROJECT}/${DISTVERSIONFULL}/:gomod \
 		https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/${DISTVERSIONFULL}/:ui
 PKGNAMESUFFIX=	3
 DISTFILES=	go.mod:gomod \
 		${PORTNAME}-web-ui-${DISTVERSION}.tar.gz:ui
 
 MAINTAINER=	danilo@FreeBSD.org
 COMMENT=	Systems monitoring and alerting toolkit
 WWW=		https://prometheus.io/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 PATCH_DEPENDS=	bash:shells/bash
 
 USES=		cpe go:modules
 
 USE_GITHUB=	yes
 USE_RC_SUBR=	prometheus
 
 GO_MODULE=	github.com/prometheus/prometheus
 GO_TARGET=	./cmd/prometheus ./cmd/promtool
 GO_BUILDFLAGS=	-a -ldflags "${LD_FLAG_STRING}" -tags netgo,builtinassets
 
 CONFLICTS_INSTALL=	prometheus1 prometheus
 
 SUB_LIST+=	PROMETHEUS_CONSOLE_LIBRARIES_DIR=${PROMETHEUS_CONSOLE_LIBRARIES_DIR} \
 		PROMETHEUS_CONSOLES_DIR=${PROMETHEUS_CONSOLES_DIR} \
 		PROMETHEUS_DB_DIR=${PROMETHEUS_DB_DIR} \
 		PROMETHEUS_GROUP=${PROMETHEUS_GROUP} \
 		PROMETHEUS_USER=${PROMETHEUS_USER}
 
 USERS=		${PROMETHEUS_USER}
 GROUPS=		${PROMETHEUS_GROUP}
 
 PLIST_SUB+=	PROMETHEUS_CONSOLE_LIBRARIES_DIR=${PROMETHEUS_CONSOLE_LIBRARIES_DIR} \
 		PROMETHEUS_CONSOLES_DIR=${PROMETHEUS_CONSOLES_DIR} \
 		PROMETHEUS_GROUP=${PROMETHEUS_GROUP} \
 		PROMETHEUS_USER=${PROMETHEUS_USER}
 
 OPTIONS_DEFINE=	DOCS
 
 BUILD_USER?=		${USER}
 LD_FLAG_STRING=		-s ${LD_FLAG_X_PREFIX}.Version=${PORTVERSION} \
 			${LD_FLAG_X_PREFIX}.Revision=${PORTREVISION} \
 			${LD_FLAG_X_PREFIX}.Branch=release-${PORTVERSION:R} \
 			${LD_FLAG_X_PREFIX}.BuildUser=${BUILD_USER} \
 			${LD_FLAG_X_PREFIX}.BuildDate=$$(date +'%Y%m%d-%H:%M:%S')
 LD_FLAG_X_PREFIX=	-X github.com/prometheus/common/version
 
 PROMETHEUS_CONSOLES_DIR?=		${DATADIR}/consoles
 PROMETHEUS_CONSOLE_LIBRARIES_DIR?=	${DATADIR}/console_libraries
 PROMETHEUS_DB_DIR?=			/var/db/${PORTNAME}
 PROMETHEUS_GROUP?=			prometheus
 PROMETHEUS_USER?=			prometheus
 
 .include <bsd.port.pre.mk>
 
 post-patch:
 	@${RM} -rf ${WRKSRC}/web/ui/static
 	@${CP} -a ${WRKDIR}/static ${WRKSRC}/web/ui/static
 	@( cd ${WRKSRC} && ${WRKSRC}/scripts/compress_assets.sh )
 
 post-install:
 	${MKDIR} ${STAGEDIR}${DESTDIR}${PROMETHEUS_CONSOLES_DIR}
 	${MKDIR} ${STAGEDIR}${DESTDIR}${PROMETHEUS_CONSOLE_LIBRARIES_DIR}
 	${INSTALL_DATA} \
 		${WRKSRC}/documentation/examples/prometheus.yml \
 		${STAGEDIR}${LOCALBASE}/etc/prometheus.yml.sample
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@( cd ${WRKSRC}/docs \
 		&& ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} )
 
 .include <bsd.port.post.mk>
diff --git a/net-mgmt/prometheus3/distinfo b/net-mgmt/prometheus3/distinfo
index 6bbba81e5c7f..6d00c10c303e 100644
--- a/net-mgmt/prometheus3/distinfo
+++ b/net-mgmt/prometheus3/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1752571020
-SHA256 (go/net-mgmt_prometheus3/prometheus-prometheus-v3.5.0_GH0/go.mod) = 6233234ceea2031a75041930e0931abf3e1123194a0ce3ca44c6468782611ba6
-SIZE (go/net-mgmt_prometheus3/prometheus-prometheus-v3.5.0_GH0/go.mod) = 12136
-SHA256 (go/net-mgmt_prometheus3/prometheus-prometheus-v3.5.0_GH0/prometheus-web-ui-3.5.0.tar.gz) = 8fec0e43c9b68e85d9dff0ba6cef29c6ba0cfe19ed54b3ff421a1656674b8abe
-SIZE (go/net-mgmt_prometheus3/prometheus-prometheus-v3.5.0_GH0/prometheus-web-ui-3.5.0.tar.gz) = 3488940
-SHA256 (go/net-mgmt_prometheus3/prometheus-prometheus-v3.5.0_GH0/prometheus-prometheus-v3.5.0_GH0.tar.gz) = fadb33c398026e190f9335e90e214065b012b9cb454da121e072697ad307cb47
-SIZE (go/net-mgmt_prometheus3/prometheus-prometheus-v3.5.0_GH0/prometheus-prometheus-v3.5.0_GH0.tar.gz) = 5129940
+TIMESTAMP = 1758878297
+SHA256 (go/net-mgmt_prometheus3/prometheus-prometheus-v3.6.0_GH0/go.mod) = 4cacd2221e09a9109e63a8c7fb663ddec3c9462dc5393a85101f0b19c7dd5c3c
+SIZE (go/net-mgmt_prometheus3/prometheus-prometheus-v3.6.0_GH0/go.mod) = 12171
+SHA256 (go/net-mgmt_prometheus3/prometheus-prometheus-v3.6.0_GH0/prometheus-web-ui-3.6.0.tar.gz) = 970d3decd4c32545a6d9163445483fe5d8cd75b8fe5bd851748685d9c433e01a
+SIZE (go/net-mgmt_prometheus3/prometheus-prometheus-v3.6.0_GH0/prometheus-web-ui-3.6.0.tar.gz) = 3491191
+SHA256 (go/net-mgmt_prometheus3/prometheus-prometheus-v3.6.0_GH0/prometheus-prometheus-v3.6.0_GH0.tar.gz) = 90586300d083873125b45e25ba68ed1ef2c48202d392405732191fffd5d99d1b
+SIZE (go/net-mgmt_prometheus3/prometheus-prometheus-v3.6.0_GH0/prometheus-prometheus-v3.6.0_GH0.tar.gz) = 5155788
diff --git a/net-mgmt/prometheus3/pkg-plist b/net-mgmt/prometheus3/pkg-plist
index a5a5f82c33c0..cd592c6003dc 100644
--- a/net-mgmt/prometheus3/pkg-plist
+++ b/net-mgmt/prometheus3/pkg-plist
@@ -1,34 +1,35 @@
 bin/prometheus
 bin/promtool
 %%PORTDOCS%%%%DOCSDIR%%/command-line/index.md
 %%PORTDOCS%%%%DOCSDIR%%/command-line/%%PROMETHEUS_USER%%.md
 %%PORTDOCS%%%%DOCSDIR%%/command-line/promtool.md
 %%PORTDOCS%%%%DOCSDIR%%/configuration/alerting_rules.md
 %%PORTDOCS%%%%DOCSDIR%%/configuration/configuration.md
 %%PORTDOCS%%%%DOCSDIR%%/configuration/https.md
 %%PORTDOCS%%%%DOCSDIR%%/configuration/index.md
+%%PORTDOCS%%%%DOCSDIR%%/configuration/promtool.md
 %%PORTDOCS%%%%DOCSDIR%%/configuration/recording_rules.md
 %%PORTDOCS%%%%DOCSDIR%%/configuration/template_examples.md
 %%PORTDOCS%%%%DOCSDIR%%/configuration/template_reference.md
 %%PORTDOCS%%%%DOCSDIR%%/configuration/unit_testing_rules.md
 %%PORTDOCS%%%%DOCSDIR%%/feature_flags.md
 %%PORTDOCS%%%%DOCSDIR%%/federation.md
 %%PORTDOCS%%%%DOCSDIR%%/getting_started.md
 %%PORTDOCS%%%%DOCSDIR%%/http_sd.md
 %%PORTDOCS%%%%DOCSDIR%%/images/remote_integrations.png
 %%PORTDOCS%%%%DOCSDIR%%/index.md
 %%PORTDOCS%%%%DOCSDIR%%/installation.md
 %%PORTDOCS%%%%DOCSDIR%%/management_api.md
 %%PORTDOCS%%%%DOCSDIR%%/migration.md
 %%PORTDOCS%%%%DOCSDIR%%/querying/api.md
 %%PORTDOCS%%%%DOCSDIR%%/querying/basics.md
 %%PORTDOCS%%%%DOCSDIR%%/querying/examples.md
 %%PORTDOCS%%%%DOCSDIR%%/querying/functions.md
 %%PORTDOCS%%%%DOCSDIR%%/querying/index.md
 %%PORTDOCS%%%%DOCSDIR%%/querying/operators.md
 %%PORTDOCS%%%%DOCSDIR%%/querying/remote_read_api.md
 %%PORTDOCS%%%%DOCSDIR%%/stability.md
 %%PORTDOCS%%%%DOCSDIR%%/storage.md
 @sample etc/prometheus.yml.sample
 @dir %%DATADIR%%/console_libraries
 @dir %%DATADIR%%/consoles