diff --git a/www/grafana9/Makefile b/www/grafana9/Makefile
index 56cdc783211c..582729100f74 100644
--- a/www/grafana9/Makefile
+++ b/www/grafana9/Makefile
@@ -1,108 +1,107 @@
 PORTNAME=	grafana
 DISTVERSIONPREFIX=	v
-DISTVERSION=	9.5.17
-PORTREVISION=	4
+DISTVERSION=	9.5.20
 CATEGORIES=	www
 MASTER_SITES=	https://dl.grafana.com/oss/release/:public \
 		https://raw.githubusercontent.com/${GH_ACCOUNT}/${GH_PROJECT}/${DISTVERSIONFULL}/:gomod
 PKGNAMESUFFIX=	${DISTVERSION:C/([0-9]).*/\1/1}
 DISTFILES=	${GRAFANA_PREBUILT}:public \
 		go.mod:gomod
 
 MAINTAINER=	drtr0jan@yandex.ru
 COMMENT=	Dashboard and graph editor for multiple data stores
 WWW=		https://github.com/grafana/grafana
 
 LICENSE=	AGPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 ONLY_FOR_ARCHS=	aarch64 amd64 i386 riscv64
 
 BUILD_DEPENDS=	wire:devel/go-wire
 RUN_DEPENDS=	ca_root_nss>=0:security/ca_root_nss
 
 USES=		cpe go:modules
 
 USE_GITHUB=	yes
 
 USE_RC_SUBR=	grafana
-TAG=		68b350c
+TAG=		1ba5cd9
 
 GO_MODULE=	github.com/grafana/grafana
 GO_TARGET=	./pkg/cmd/grafana \
 		./pkg/cmd/grafana-server \
 		./pkg/cmd/grafana-cli
 GO_BUILDFLAGS=	-ldflags="-w -X main.version=${PORTVERSION} -X main.commit=${TAG}"
 
 CONFLICTS_INSTALL=	grafana*
 
 SUB_LIST=	GRAFANA_USER=${GRAFANA_USER} \
 		GRAFANA_GROUP=${GRAFANA_GROUP} \
 		GRAFANA_DATADIR=${GRAFANA_DATADIR} \
 		GRAFANA_HOMEDIR=${GRAFANA_HOMEDIR} \
 		GRAFANA_LOGDIR=${GRAFANA_LOGDIR} \
 		GRAFANA_PLUGINDIR=${GRAFANA_PLUGINDIR} \
 		GRAFANA_PROVISIONINGDIR=${GRAFANA_PROVISIONINGDIR}
 
 GRAFANA_USER?=	grafana
 GRAFANA_GROUP?=	grafana
 
 USERS=		${GRAFANA_USER}
 GROUPS=		${GRAFANA_GROUP}
 
 PLIST_SUB=	${SUB_LIST}
 
 GRAFANA_PREBUILT=		grafana-${DISTVERSION}.linux-amd64${EXTRACT_SUFX}
 GRAFANA_DATADIR?=		/var/db/${PORTNAME}
 GRAFANA_HOMEDIR?=		${DATADIR}
 GRAFANA_LOGDIR?=		/var/log/${PORTNAME}
 GRAFANA_PLUGINDIR?=		${GRAFANA_DATADIR}/plugins
 GRAFANA_PROVISIONINGDIR?=	${ETCDIR}/provisioning
 
 do-extract: ${EXTRACT_WRKDIR}
 	@if ! (cd ${EXTRACT_WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${DISTFILE_DEFAULT} ${EXTRACT_AFTER_ARGS});\
 	then \
 		${ECHO_MSG} "===>  Failed to extract \"${_DISTDIR}/${GRAFANA_SOURCES}\"."; \
 		exit 1; \
 	fi;
 	@if ! (cd ${EXTRACT_WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${GRAFANA_PREBUILT} ${EXTRACT_AFTER_ARGS});\
 	then \
 		${ECHO_MSG} "===>  Failed to extract \"${_DISTDIR}/${GRAFANA_PREBUILT}\"."; \
 		exit 1; \
 	fi
 	@if [ ${UID} = 0 ]; then \
 		${CHMOD} -R ug-s ${WRKDIR}; \
 		${CHOWN} -R 0:0 ${WRKDIR}; \
 	fi
 
 post-patch:
 	@${REINPLACE_CMD} \
 		-e 's|;data = /var/lib/grafana|data = ${GRAFANA_DATADIR}|g' \
 		-e 's|;logs = /var/log/grafana|logs = ${GRAFANA_LOGDIR}|g' \
 		-e 's|;plugins = /var/lib/grafana/plugins|plugins = ${GRAFANA_PLUGINDIR}|g' \
 		-e 's|;provisioning = conf/provisioning|provisioning = ${GRAFANA_PROVISIONINGDIR}|g' \
 		 ${WRKSRC}/conf/sample.ini
 
 pre-build:
 	@(cd ${GO_WRKSRC}; \
 	${ECHO_MSG} "===>  Generating wire_gen.go"; \
 	${SETENV} ${MAKE_ENV} ${GO_ENV} wire gen -tags "oss" ./pkg/server )
 
 post-install:
 	${MKDIR} ${STAGEDIR}${GRAFANA_HOMEDIR}
 	${MKDIR} ${STAGEDIR}${GRAFANA_HOMEDIR}/conf
 	${MKDIR} ${STAGEDIR}${GRAFANA_DATADIR}
 	${MKDIR} ${STAGEDIR}${GRAFANA_PLUGINDIR}
 .for dir in access-control alerting dashboards datasources notifiers plugins
 	${MKDIR} ${STAGEDIR}${GRAFANA_PROVISIONINGDIR}/${dir}
 .endfor
 	${MKDIR} ${STAGEDIR}${GRAFANA_LOGDIR}
 	( cd ${WRKDIR}/${PORTNAME}-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX} && ${COPYTREE_SHARE} public ${STAGEDIR}${GRAFANA_HOMEDIR} )
 .for dir in input-datasource
 	${MKDIR} ${STAGEDIR}${GRAFANA_HOMEDIR}/plugins-bundled/internal/${dir}
 	( cd ${WRKDIR}/${PORTNAME}-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}/plugins-bundled/internal/${dir}/dist && ${COPYTREE_SHARE} . ${STAGEDIR}${GRAFANA_HOMEDIR}/plugins-bundled/internal/${dir} )
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/conf/defaults.ini ${STAGEDIR}${GRAFANA_HOMEDIR}/conf/defaults.ini
 	${INSTALL_DATA} ${WRKSRC}/conf/sample.ini ${STAGEDIR}${ETCDIR}/grafana.ini.sample
 
 .include <bsd.port.mk>
diff --git a/www/grafana9/distinfo b/www/grafana9/distinfo
index 703466b9043f..69bd6964d550 100644
--- a/www/grafana9/distinfo
+++ b/www/grafana9/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1709976232
-SHA256 (go/www_grafana9/grafana-grafana-v9.5.17_GH0/grafana-9.5.17.linux-amd64.tar.gz) = 4a90104228a444a6ab64dcd34d3a288e2c3ff47dc7cbff0e526e3f02b66a25aa
-SIZE (go/www_grafana9/grafana-grafana-v9.5.17_GH0/grafana-9.5.17.linux-amd64.tar.gz) = 87614963
-SHA256 (go/www_grafana9/grafana-grafana-v9.5.17_GH0/go.mod) = 19d97307a9479ebc7b3d7aa57480bf1ef17b256f997fecb0f247d59dc2c194bb
-SIZE (go/www_grafana9/grafana-grafana-v9.5.17_GH0/go.mod) = 21077
-SHA256 (go/www_grafana9/grafana-grafana-v9.5.17_GH0/grafana-grafana-v9.5.17_GH0.tar.gz) = a3c4026b96eebc625af28e7a7268adaa3e6e59f902056396873cf4bde4aff9d8
-SIZE (go/www_grafana9/grafana-grafana-v9.5.17_GH0/grafana-grafana-v9.5.17_GH0.tar.gz) = 26358518
+TIMESTAMP = 1720812577
+SHA256 (go/www_grafana9/grafana-grafana-v9.5.20_GH0/grafana-9.5.20.linux-amd64.tar.gz) = 1127253cf64e7f911c07ff605e8afbaa950bde826d3ef534dae3fcfcbf8d8d39
+SIZE (go/www_grafana9/grafana-grafana-v9.5.20_GH0/grafana-9.5.20.linux-amd64.tar.gz) = 87672983
+SHA256 (go/www_grafana9/grafana-grafana-v9.5.20_GH0/go.mod) = b0efefd1ad6626c438ec2d3e3089be1a623779cc2269a1da43df94fdf7f101f8
+SIZE (go/www_grafana9/grafana-grafana-v9.5.20_GH0/go.mod) = 20981
+SHA256 (go/www_grafana9/grafana-grafana-v9.5.20_GH0/grafana-grafana-v9.5.20_GH0.tar.gz) = 034156b29b3baacf2af642886e296bd884819f8914348d54af0d722856a849a5
+SIZE (go/www_grafana9/grafana-grafana-v9.5.20_GH0/grafana-grafana-v9.5.20_GH0.tar.gz) = 26501307