diff --git a/net-mgmt/prometheus2/Makefile b/net-mgmt/prometheus2/Makefile
index a0eb2812bbe0..ad44a5a9f18c 100644
--- a/net-mgmt/prometheus2/Makefile
+++ b/net-mgmt/prometheus2/Makefile
@@ -1,80 +1,84 @@
 PORTNAME=	prometheus
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.33.5
+DISTVERSION=	2.36.0
 CATEGORIES=	net-mgmt
-MASTER_SITES=	https://raw.githubusercontent.com/${GH_ACCOUNT}/${GH_PROJECT}/${DISTVERSIONFULL}/:gomod
-DISTFILES=	go.mod:gomod
+MASTER_SITES=	https://raw.githubusercontent.com/${GH_ACCOUNT}/${GH_PROJECT}/${DISTVERSIONFULL}/:gomod \
+		https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/${DISTVERSIONFULL}/:ui
+DISTFILES=	go.mod:gomod ${PORTNAME}-web-ui-${DISTVERSION}.tar.gz:ui
 
 MAINTAINER=	dor.bsd@xm0.uk
 COMMENT=	Systems monitoring and alerting toolkit
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+PATCH_DEPENDS=	bash:shells/bash
+
 USES=		cpe gmake go:modules
 
 USE_GITHUB=	yes
-GH_TUPLE=	ports-assets:net-mgmt_prometheus2:${DISTVERSIONFULL}:assets
 USE_RC_SUBR=	prometheus
 
 GO_MODULE=	github.com/prometheus/prometheus
 GO_TARGET=	./cmd/prometheus ./cmd/promtool
 GO_BUILDFLAGS=	-a -v -ldflags "${LD_FLAG_STRING}" -tags netgo,builtinassets
 
 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=${SOURCE_DATE_EPOCH:U${SOURCE_DATE_EPOCH_CMD:sh}}
 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
 
 # Bring DISTINFO_FILE into scope so we can get the timestamp.
 .include <bsd.port.pre.mk>
 
 SOURCE_DATE_EPOCH_CMD=	date -ur $$(${GREP} TIMESTAMP ${DISTINFO_FILE} | ${SED} -e 's/[^0-9]//g') \
 			'+%Y%m%d-%T'
 
 post-patch:
-	@${LN} -s ${WRKSRC_assets}/web/ui/assets_vfsdata.go \
-		${WRKSRC}/web/ui/assets_vfadata.go
+	@${RM} -rf ${WRKSRC}/web/ui/static
+	# A symlink isn't good enough here, copy the entire static directory over
+	@${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
 	( cd ${WRKSRC}/console_libraries \
 		&& ${COPYTREE_SHARE} . ${STAGEDIR}${PROMETHEUS_CONSOLE_LIBRARIES_DIR} )
 	( cd ${WRKSRC}/consoles \
 		&& ${COPYTREE_SHARE} . ${STAGEDIR}${PROMETHEUS_CONSOLES_DIR} )
 
 post-install-DOCS-on:
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	( cd ${WRKSRC}/docs \
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	@( cd ${WRKSRC}/docs \
 		&& ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} )
 
 .include <bsd.port.post.mk>
diff --git a/net-mgmt/prometheus2/distinfo b/net-mgmt/prometheus2/distinfo
index 642d88bd0068..1053cddcda8d 100644
--- a/net-mgmt/prometheus2/distinfo
+++ b/net-mgmt/prometheus2/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1653749506
-SHA256 (go/net-mgmt_prometheus2/prometheus-prometheus-v2.33.5_GH0/go.mod) = 5ea7655ecbe5065b78619bac7277d2598e3301387a65cbf210a686b7955e0298
-SIZE (go/net-mgmt_prometheus2/prometheus-prometheus-v2.33.5_GH0/go.mod) = 4541
-SHA256 (go/net-mgmt_prometheus2/prometheus-prometheus-v2.33.5_GH0/prometheus-prometheus-v2.33.5_GH0.tar.gz) = a385dab190fd4bf973a9950d6c53fa9d2b92c55ea2225a53305fe546749ddc0d
-SIZE (go/net-mgmt_prometheus2/prometheus-prometheus-v2.33.5_GH0/prometheus-prometheus-v2.33.5_GH0.tar.gz) = 5858953
-SHA256 (go/net-mgmt_prometheus2/prometheus-prometheus-v2.33.5_GH0/ports-assets-net-mgmt_prometheus2-v2.33.5_GH0.tar.gz) = af7d729e4b69d7e90d70d9e64c31ee850616417318fc1168999ef0320988a550
-SIZE (go/net-mgmt_prometheus2/prometheus-prometheus-v2.33.5_GH0/ports-assets-net-mgmt_prometheus2-v2.33.5_GH0.tar.gz) = 6047050
+TIMESTAMP = 1653992116
+SHA256 (go/net-mgmt_prometheus2/prometheus-prometheus-v2.36.0_GH0/go.mod) = 74e49f0f2cf67d6c9dbcb3626cb9fa12ee4b95a977f7c5763851ba5fb3f709bb
+SIZE (go/net-mgmt_prometheus2/prometheus-prometheus-v2.36.0_GH0/go.mod) = 9168
+SHA256 (go/net-mgmt_prometheus2/prometheus-prometheus-v2.36.0_GH0/prometheus-web-ui-2.36.0.tar.gz) = 0be369da6a80610d5152a626aa5d1eb9d3c3fd2a569b174c40b7bce527a7200e
+SIZE (go/net-mgmt_prometheus2/prometheus-prometheus-v2.36.0_GH0/prometheus-web-ui-2.36.0.tar.gz) = 4387594
+SHA256 (go/net-mgmt_prometheus2/prometheus-prometheus-v2.36.0_GH0/prometheus-prometheus-v2.36.0_GH0.tar.gz) = c7b3b17edc22f93c4573b42c7c892123036b518f6058a0a97637b4190f74bc3f
+SIZE (go/net-mgmt_prometheus2/prometheus-prometheus-v2.36.0_GH0/prometheus-prometheus-v2.36.0_GH0.tar.gz) = 6019777
diff --git a/net-mgmt/prometheus2/pkg-message b/net-mgmt/prometheus2/pkg-message
index 10ae0129b88d..4fed5e509efa 100644
--- a/net-mgmt/prometheus2/pkg-message
+++ b/net-mgmt/prometheus2/pkg-message
@@ -1,69 +1,78 @@
 [
+{
+  message: <<EOF
+TLS 1.0 and 1.1 disabled by default client-side.
+Prometheus users can override this with the min_version parameter of tls_config.
+Certificates signed with the SHA-1 hash function are rejected. This doesn't apply to self-signed root certificates.
+EOF
+  maximum_version: "2.36.0"
+  type: upgrade
+}
 {
   message: <<EOF
 promtool: Changed rule numbering from 0-based to 1-based when reporting rule errors.
 Added `prometheus_remote_storage_read_queries_total` counter and
 `prometheus_remote_storage_read_request_duration_seconds` histogram, removed
 `prometheus_remote_storage_remote_read_queries_total` counter.
 Added buckets for longer durations to
 `prometheus_remote_storage_sent_batch_duration_seconds` histogram.
 WAL compression is enabled by default.
 EOF
   maximum_version: "2.20"
   type: upgrade
 }
 {
   message: <<EOF
 The `prometheus_sd_kubernetes_cache_*` metrics were removed.
 The `prometheus_sd_kubernetes_workqueue_latency_seconds` and
 `prometheus_sd_kubernetes_workqueue_work_duration_seconds` now show correct
 values in seconds.
 The `query` label on `prometheus_remote_storage_*` metrics has been changed to
 `remote_name` and `url`.
 EOF
   maximum_version: "2.15"
   type: upgrade
 }
 {
   message: <<EOF
 The `prometheus_tsdb_wal_reader_corruption_errors` metric was renamed to
 `prometheus_tsdb_wal_reader_corruption_errors_total`.
 EOF
   maximum_version: "2.11"
   type: upgrade
 }
 {
   message: <<EOF
 The `prometheus_tsdb_storage_blocks_bytes_total` metric is now
 `prometheus_tsdb_storage_blocks_bytes`.
 EOF
   maximum_version: "2.8"
   type: upgrade
 }
 {
   message: <<EOF
 The `storage.tsdb.retention` flag has been deprecated in Prometheus 2.7.0.
 Users of this flag will want to update their configuration to use the newer
 `storage.tsdb.retention.time` flag.
 EOF
   maximum_version: "2.7"
   type: upgrade
 }
 {
   message: <<EOF
 Users of `marathon_sd` should now use `auth_token` and `auth_token_file` for
 token-based authentication instead of `bearer_token` and `bearer_token_file`
 respectively.
 Metric names for the HTTP server metrics were changed.
 EOF
   maximum_version: "2.3"
   type: upgrade
 }
 {
   message: <<EOF
 The `file_sd` mtime metric was renamed.
 EOF
   maximum_version: "2.2"
   type: upgrade
 }
 ]