diff --git a/sysutils/go-ntfy/Makefile b/sysutils/go-ntfy/Makefile
index b0a010c34db2..1ca9c6d82fa7 100644
--- a/sysutils/go-ntfy/Makefile
+++ b/sysutils/go-ntfy/Makefile
@@ -1,68 +1,68 @@
 PORTNAME=	ntfy
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.20.0
+DISTVERSION=	2.21.0
 CATEGORIES=	sysutils
 MASTER_SITES=	LOCAL/dtxdf/${PORTNAME}/:assets
 PKGNAMEPREFIX=	go-
 # For instructions on how to create assets:
 #   https://github.com/DtxdF/port-assets-makejails/tree/main/ntfy
 DISTFILES=	${PORTNAME}-${DISTVERSIONPREFIX}${DISTVERSION}.frontend${EXTRACT_SUFX}:assets
 
 MAINTAINER=	dtxdf@FreeBSD.org
 COMMENT=	Send push notifications to your phone or desktop using PUT/POST
 WWW=		https://ntfy.sh
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		go:1.26+,modules
 USE_GITHUB=	yes
 GH_ACCOUNT=	binwiederhier
 
 USE_RC_SUBR=	${PORTNAME}
 
 GO_MOD_DIST=	github
 GO_MODULE=	github.com/binwiederhier/${PORTNAME}
 GO_BUILDFLAGS=	-ldflags "\
 			-X 'main.version=${DISTVERSION}' \
 			-X 'main.commit=${GITID}' \
 			-X 'main.date=${BUILD_DATE}'"
 
 CONFLICTS_INSTALL=	sysutils/ntfy
 
 PLIST_FILES=	"@sample ${ETCDIR}/client.yml.sample" \
 		"@sample ${ETCDIR}/server.yml.sample" \
 		bin/${PORTNAME}
 
 OPTIONS_DEFINE=	DOCS
 
 DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mkdocs-material>=0:textproc/py-mkdocs-material@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}mkdocs-minify-plugin>=0:textproc/py-mkdocs-minify-plugin@${PY_FLAVOR}
 DOCS_USES=		python
 
 # Run 'git checkout ${DISTVERSIONPREFIX}${DISTVERSION} && git rev-parse --short HEAD'
 # in the ntfy repository to get the value of GITID.
-GITID=		2235d447
+GITID=		7ce5e8a
 
 BUILD_DATE=	$$(date -u "+%Y-%m-%dT%H:%M:%SZ")
 
 post-patch:
 	@${GREP} -rl "/etc/${PORTNAME}" ${WRKSRC}/cmd ${WRKSRC}/server \
 		| ${XARGS} ${REINPLACE_CMD} -e 's#/etc/${PORTNAME}#${ETCDIR}#g'
 
 pre-build:
 	@${MKDIR} ${WRKSRC}/server/docs
 	${TOUCH} ${WRKSRC}/server/docs/index.html
 	${RM} -r ${WRKSRC}/server/site
 	@${MKDIR} ${WRKSRC}/server/site
 	@cd ${WRKDIR}/ntfy-frontend && ${COPYTREE_SHARE} . ${WRKSRC}/server/site
 
 pre-build-DOCS-on:
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} mkdocs build
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${WRKSRC}/server/server.yml ${STAGEDIR}${ETCDIR}/server.yml.sample
 	${INSTALL_DATA} ${WRKSRC}/client/client.yml ${STAGEDIR}${ETCDIR}/client.yml.sample
 
 .include <bsd.port.mk>
diff --git a/sysutils/go-ntfy/distinfo b/sysutils/go-ntfy/distinfo
index f5bb8d0e9c4e..0bdeef08e97a 100644
--- a/sysutils/go-ntfy/distinfo
+++ b/sysutils/go-ntfy/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1774559138
-SHA256 (go/sysutils_go-ntfy/binwiederhier-ntfy-v2.20.0_GH0/ntfy-v2.20.0.frontend.tar.gz) = 1cddc69704fd0921e998109584fcc874b671711223d6b9d038f1d7ec049cea88
-SIZE (go/sysutils_go-ntfy/binwiederhier-ntfy-v2.20.0_GH0/ntfy-v2.20.0.frontend.tar.gz) = 2360268
-SHA256 (go/sysutils_go-ntfy/binwiederhier-ntfy-v2.20.0_GH0/go.mod) = c60e4154517c360fa7d136b8642ae4004a3b025beaeb24bdb3fa290dd360ad9a
-SIZE (go/sysutils_go-ntfy/binwiederhier-ntfy-v2.20.0_GH0/go.mod) = 4929
-SHA256 (go/sysutils_go-ntfy/binwiederhier-ntfy-v2.20.0_GH0/binwiederhier-ntfy-v2.20.0_GH0.tar.gz) = 3b8dc540ee0e4dc6fa66457461d8473d549616530d0105e7eda9c8657019ce1f
-SIZE (go/sysutils_go-ntfy/binwiederhier-ntfy-v2.20.0_GH0/binwiederhier-ntfy-v2.20.0_GH0.tar.gz) = 15843933
+TIMESTAMP = 1775694565
+SHA256 (go/sysutils_go-ntfy/binwiederhier-ntfy-v2.21.0_GH0/ntfy-v2.21.0.frontend.tar.gz) = 4a778ac167e142e518ad8737601a650a44541e731e59b101fe0ec419cdfc7429
+SIZE (go/sysutils_go-ntfy/binwiederhier-ntfy-v2.21.0_GH0/ntfy-v2.21.0.frontend.tar.gz) = 2362389
+SHA256 (go/sysutils_go-ntfy/binwiederhier-ntfy-v2.21.0_GH0/go.mod) = c7ae4bcb1ac1d08cc1c74959dd09e55c8932c6b7771cf460de95b02995ce3125
+SIZE (go/sysutils_go-ntfy/binwiederhier-ntfy-v2.21.0_GH0/go.mod) = 4929
+SHA256 (go/sysutils_go-ntfy/binwiederhier-ntfy-v2.21.0_GH0/binwiederhier-ntfy-v2.21.0_GH0.tar.gz) = 02323e45a04de175456701c9ff741c8e00602ced22d8fd59842d88ab66e267cf
+SIZE (go/sysutils_go-ntfy/binwiederhier-ntfy-v2.21.0_GH0/binwiederhier-ntfy-v2.21.0_GH0.tar.gz) = 15850299