diff --git a/devel/athens/Makefile b/devel/athens/Makefile
index 68198bf2012c..ce72272aab35 100644
--- a/devel/athens/Makefile
+++ b/devel/athens/Makefile
@@ -1,38 +1,37 @@
 PORTNAME=	athens
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.18.0
-PORTREVISION=	1
+DISTVERSION=	0.18.1
 CATEGORIES=	devel
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Proxy server for the Go Modules download API
 WWW=		https://github.com/gomods/athens
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		go:1.26+,modules
 USE_RC_SUBR=	${PORTNAME}
 
 GO_MODULE=	github.com/gomods/${PORTNAME}
 GO_TARGET=	./cmd/proxy
 GO_BUILDFLAGS=	-ldflags " \
 		-X github.com/gomods/${PORTNAME}/pkg/build.version=${DISTVERSION} \
 		-X github.com/gomods/${PORTNAME}/pkg/build.buildDate=${BUILD_DATE}"
 
 SUB_LIST=	ATHENS_USER=${USERS} \
 		ATHENS_GROUP=${GROUPS}
 
 USERS=		${PORTNAME}
 GROUPS=		${PORTNAME}
 
-BUILD_DATE=	2026-06-15-00:00:00-UTC
+BUILD_DATE=	2026-07-15-00:00:00-UTC
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKDIR}/bin/proxy ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 
 post-install:
 	${MKDIR} ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${BUILD_WRKSRC}/config.dev.toml ${STAGEDIR}${ETCDIR}/athens.toml.sample
 
 .include <bsd.port.mk>
diff --git a/devel/athens/distinfo b/devel/athens/distinfo
index 91677dfd46a0..93944c28e5db 100644
--- a/devel/athens/distinfo
+++ b/devel/athens/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1781541751
-SHA256 (go/devel_athens/athens-v0.18.0/v0.18.0.mod) = 5a1f4b3f3848f5bf459420b1736531cc155b1f3cccfdb440a8ec99b268a0cf56
-SIZE (go/devel_athens/athens-v0.18.0/v0.18.0.mod) = 10184
-SHA256 (go/devel_athens/athens-v0.18.0/v0.18.0.zip) = 7f9c6a7f44e0102560b17230a985eeba29949a69734f0dc120e66d27e412d07d
-SIZE (go/devel_athens/athens-v0.18.0/v0.18.0.zip) = 4237196
+TIMESTAMP = 1784486781
+SHA256 (go/devel_athens/athens-v0.18.1/v0.18.1.mod) = c59937d586d74037b6324af62ef04fa60aaa3dac19e188c4f52bdd0d78d66f1b
+SIZE (go/devel_athens/athens-v0.18.1/v0.18.1.mod) = 9224
+SHA256 (go/devel_athens/athens-v0.18.1/v0.18.1.zip) = 4fa11c91a8e7ff451cefe646ac5fe42989d0df0427e3cc73722fcf6f71d10ad9
+SIZE (go/devel_athens/athens-v0.18.1/v0.18.1.zip) = 4224819
diff --git a/devel/athens/files/athens.in b/devel/athens/files/athens.in
index d2ac754ed38d..89efe67e517a 100644
--- a/devel/athens/files/athens.in
+++ b/devel/athens/files/athens.in
@@ -1,51 +1,51 @@
 #!/bin/sh
 #
 # PROVIDE: athens
 # REQUIRE: LOGIN NETWORKING
 # KEYWORD: shutdown
 #
 # athens_enable (bool):
 #   Default value: "NO"
 #   Flag that determines whether athens is enabled
 #
 # athens_config (string)
 #   Default value %%ETCDIR%%/athens.toml
 #   Path to the athens configuration file
 #
 # athens_user (string)
 #   This is the user that athens runs as
 #   Set to %%ATHENS_USER%% by default
 #
 # athens_group (string)
 #   This is the group that athens runs as
 #   Set to %%ATHENS_GROUP%% by default
 
 . /etc/rc.subr
 
 name=athens
 rcvar=athens_enable
 
 load_rc_config $name
 
 : ${athens_enable:="NO"}
 : ${athens_config:="%%ETCDIR%%/athens.toml"}
 : ${athens_user:=%%ATHENS_USER%%}
 : ${athens_group:=%%ATHENS_GROUP%%}
 
 athens_command="%%PREFIX%%/bin/athens -config_file ${athens_config}"
 pidfile="/var/run/${name}/${name}.pid"
 command="/usr/sbin/daemon"
-command_args="-P ${pidfile} -S ${athens_command}"
+command_args="-P ${pidfile} -S ${athens_command} -T ${name}"
 
 PATH="${PATH}:%%PREFIX%%/bin"
 
 required_files="${athens_config}"
 
 start_precmd="athens_precmd"
 
 athens_precmd()
 {
   /usr/bin/install -d -m 700 -o "${athens_user}" -g "${athens_group}" /var/run/athens
 }
 
 run_rc_command "$1"