diff --git a/sysutils/go-ntfy/Makefile b/sysutils/go-ntfy/Makefile
index 16eb8fd076e6..d8675e67f76a 100644
--- a/sysutils/go-ntfy/Makefile
+++ b/sysutils/go-ntfy/Makefile
@@ -1,69 +1,68 @@
 PORTNAME=	ntfy
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.17.0
-PORTREVISION=	1
+DISTVERSION=	2.18.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:modules
+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=		a03a37fe
+GITID=		b59e35cb
 
 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 e6d568777080..0cf97fe7a646 100644
--- a/sysutils/go-ntfy/distinfo
+++ b/sysutils/go-ntfy/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1770941037
-SHA256 (go/sysutils_go-ntfy/binwiederhier-ntfy-v2.17.0_GH0/ntfy-v2.17.0.frontend.tar.gz) = ee0972de643299d9f0e95a98e535dfa33456328f78a9f6baf06ec2c1f3a8216a
-SIZE (go/sysutils_go-ntfy/binwiederhier-ntfy-v2.17.0_GH0/ntfy-v2.17.0.frontend.tar.gz) = 2359576
-SHA256 (go/sysutils_go-ntfy/binwiederhier-ntfy-v2.17.0_GH0/go.mod) = e2ef4a1dbfe2bd334511f24c24529153bbccec9882f78457381ffa94de048ca1
-SIZE (go/sysutils_go-ntfy/binwiederhier-ntfy-v2.17.0_GH0/go.mod) = 4723
-SHA256 (go/sysutils_go-ntfy/binwiederhier-ntfy-v2.17.0_GH0/binwiederhier-ntfy-v2.17.0_GH0.tar.gz) = 2d2e4bb79998b52355407766cbf84e21fb7c650fd93c0a3663f3fcabadb2544d
-SIZE (go/sysutils_go-ntfy/binwiederhier-ntfy-v2.17.0_GH0/binwiederhier-ntfy-v2.17.0_GH0.tar.gz) = 15464512
+TIMESTAMP = 1773118283
+SHA256 (go/sysutils_go-ntfy/binwiederhier-ntfy-v2.18.0_GH0/ntfy-v2.18.0.frontend.tar.gz) = 1b49f253b107000549935b53ca435c17824aa8b342238b8a64780c95f720c353
+SIZE (go/sysutils_go-ntfy/binwiederhier-ntfy-v2.18.0_GH0/ntfy-v2.18.0.frontend.tar.gz) = 2355904
+SHA256 (go/sysutils_go-ntfy/binwiederhier-ntfy-v2.18.0_GH0/go.mod) = be6d5c5fb5def92eb1167344e3d595dea2aef8ce6dbfa45ea714a74915576ec2
+SIZE (go/sysutils_go-ntfy/binwiederhier-ntfy-v2.18.0_GH0/go.mod) = 4929
+SHA256 (go/sysutils_go-ntfy/binwiederhier-ntfy-v2.18.0_GH0/binwiederhier-ntfy-v2.18.0_GH0.tar.gz) = 651b7837b564929e843f4e6af2758eb20768335aac0a2f58481a6bce0e4787b3
+SIZE (go/sysutils_go-ntfy/binwiederhier-ntfy-v2.18.0_GH0/binwiederhier-ntfy-v2.18.0_GH0.tar.gz) = 15494778
diff --git a/sysutils/go-ntfy/files/ntfy.in b/sysutils/go-ntfy/files/ntfy.in
index f681ce0b5c1b..f205ad6ad038 100644
--- a/sysutils/go-ntfy/files/ntfy.in
+++ b/sysutils/go-ntfy/files/ntfy.in
@@ -1,32 +1,32 @@
 #!/bin/sh
 
 # PROVIDE: ntfy
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
 #
 # Configuration settings for ntfy in /etc/rc.conf
 #
 # ntfy_enable (bool):    Enable ntfy. (default=NO)
 # ntfy_log (str):        Log output. (default=/var/log/ntfy.log)
 # ntfy_runas (str):      User to run ntfy as. (default=www)
 #
 
 . /etc/rc.subr
 
 name="ntfy"
 desc="Send push notifications to your phone or desktop using PUT/POST"
 rcvar="${name}_enable"
 
 load_rc_config $name
 
 : ${ntfy_enable:="NO"}
 : ${ntfy_log:="/var/log/ntfy.log"}
 : ${ntfy_runas:="www"}
-: ${ntfy_args="--listen-http :8080"}
+: ${ntfy_args=""}
 
 pidfile="/var/run/${name}.pid"
 procname="%%LOCALBASE%%/bin/${name}"
 command="/usr/sbin/daemon"
 command_args="-c -u '${ntfy_runas}' -p '${pidfile}' -t '${desc}' -o '${ntfy_log}' '${procname}' serve ${ntfy_args}"
 
 run_rc_command "$1"
diff --git a/sysutils/go-ntfy/files/patch-server_server.yml b/sysutils/go-ntfy/files/patch-server_server.yml
new file mode 100644
index 000000000000..6fea2f1b323e
--- /dev/null
+++ b/sysutils/go-ntfy/files/patch-server_server.yml
@@ -0,0 +1,11 @@
+--- server/server.yml.orig	2026-03-10 04:55:20 UTC
++++ server/server.yml
+@@ -19,7 +19,7 @@
+ # To listen on all interfaces, you may omit the IP address, e.g. ":443".
+ # To disable HTTP, set "listen-http" to "-".
+ #
+-# listen-http: ":80"
++listen-http: ":8080"
+ # listen-https:
+ 
+ # Listen on a Unix socket, e.g. /var/lib/ntfy/ntfy.sock