diff --git a/dns/godns/Makefile b/dns/godns/Makefile
index 8f9216247b92..ce49cbb7ec02 100644
--- a/dns/godns/Makefile
+++ b/dns/godns/Makefile
@@ -1,44 +1,42 @@
 PORTNAME=	godns
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.4.1
 PORTREVISION=	1
 CATEGORIES=	dns
 MASTER_SITES=	https://raw.githubusercontent.com/TimothyYe/${PORTNAME}/${DISTVERSIONFULL}/:gomod \
 		https://github.com/TimothyYe/${PORTNAME}/releases/download/v${DISTVERSION}/:webui
 DISTFILES=	go.mod:gomod \
 		${PORTNAME}-web-${DISTVERSIONFULL}.zip:webui
 EXTRACT_ONLY=	${DISTFILE_DEFAULT}
 
 MAINTAINER=	diizzy@FreeBSD.org
 COMMENT=	Dynamic DNS client (DDNS) with optional external reporting features
 WWW=		https://github.com/TimothyYe/godns
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		go:1.24+,modules
 USE_RC_SUBR=	${PORTNAME}
 USE_GITHUB=	yes
 
 GH_ACCOUNT=	TimothyYe
 GO_MODULE=	github.com/TimothyYe/godns
 GO_TARGET=	./cmd/${PORTNAME}
 
-SUB_FILES=	pkg-message
-
 post-extract:
 	@if [ ! -d ${WRKSRC}/internal/server/out ]; then \
 	    ${MKDIR} ${PATCH_WRKSRC}/internal/server/out ;\
 	    (${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${_DISTFILES:M*web*} -C ${WRKSRC}/internal/server ${EXTRACT_AFTER_ARGS}) ;\
 	fi
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
 	    ${PATCH_WRKSRC}/cmd/godns/godns.go
 	@${REINPLACE_CMD} -e 's|%%DISTVERSION%%|${DISTVERSION}|g' \
 	    ${PATCH_WRKSRC}/cmd/godns/godns.go
 
 post-install:
 	${INSTALL_DATA} ${FILESDIR}/godns-config.json.sample ${STAGEDIR}${PREFIX}/etc
 
 .include <bsd.port.mk>
diff --git a/dns/godns/files/godns.in b/dns/godns/files/godns.in
index 1785c653ce5a..2094b008be77 100644
--- a/dns/godns/files/godns.in
+++ b/dns/godns/files/godns.in
@@ -1,55 +1,55 @@
 #!/bin/sh
 
 # PROVIDE: godns
 # REQUIRE: DAEMON LOGIN
 # KEYWORD: shutdown
 
 #
 # Add the following line to /etc/rc.conf to enable godns:
 # godns_enable (bool):		Set to "NO" by default.
 #				Set it to "YES" to enable godns.
 # godns_flags (str):		Custom additional arguments to be passed
 #				to godns (default empty).
 # godns_conf_dir (str):		Directory where ${name} configuration
-#				data is stored.
+#				file is located.
 
 . /etc/rc.subr
 
 name="godns"
 rcvar=godns_enable
 
 load_rc_config ${name}
 
 : ${godns_enable:="NO"}
 : ${godns_user:="nobody"}
 : ${godns_group:="nogroup"}
 : ${godns_conf_dir="%%PREFIX%%/etc"}
 
 start_precmd=godns_precmd
 stop_postcmd=godns_stop_postcmd
 
 procname="%%PREFIX%%/bin/${name}"
 pidfile="/var/run/${name}/${name}.pid"
 logfile="/var/log/${name}/${name}.log"
 
 required_files="${godns_conf_dir}/${name}-config.json"
 
 command="/usr/sbin/daemon"
 command_args="-f -t ${name} -o ${logfile} -p ${pidfile} ${procname} -c ${required_files} ${godns_args}"
 
 godns_precmd()
 {
 	local rundir=${pidfile%/*}
 	if [ ! -d $rundir ] ; then
 		install -d -m 0755 -o ${godns_user} -g ${godns_group} $rundir
 	fi
 	local logdir=${logfile%/*}
 	install -d -m 0750 -o ${godns_user} -g ${godns_group} $logdir
 }
 
 godns_stop_postcmd()
 {
 	rm -f "$rundir"
 }
 
 run_rc_command "$1"
diff --git a/dns/godns/pkg-descr b/dns/godns/pkg-descr
index d9435aa9278b..f6f0ae939599 100644
--- a/dns/godns/pkg-descr
+++ b/dns/godns/pkg-descr
@@ -1,3 +1,3 @@
-GoDNS is Dynamic DNS (DDNS) a client that supports various domain providers
+GoDNS is a Dynamic DNS (DDNS) client that supports various domain providers
 and allows generating notifications upon change through e-mail (SMTP) or using
 services such as Discord, Pushover, Slack and Telegram.
diff --git a/dns/godns/files/pkg-message.in b/dns/godns/pkg-message
similarity index 63%
rename from dns/godns/files/pkg-message.in
rename to dns/godns/pkg-message
index 19fb4b69411b..d895468c5b03 100644
--- a/dns/godns/files/pkg-message.in
+++ b/dns/godns/pkg-message
@@ -1,22 +1,22 @@
 [
 { type: install
   message: <<EOM
   Edit /etc/rc.conf(.local) to start GoDNS automatically at system
   startup. Command line arguments can be set via godns_args.
 
-  A sample configuration file is installed at the follow location:
+  A sample configuration file is installed at the following location:
   %%PREFIX%%/etc/godns-config.json.sample
 
-  If you're testing out your setup be aware that GoDNS will refuse
-  to run if you've disabled external ip address lookup and local
-  interface uses a private ip address.
+  If you're testing be aware that GoDNS will refuse to run if you've
+  disabled external ip address lookup and local interface uses a
+  private ip address.
 
   Logfile is located at /var/log/godns/godns.log
 
   Web frontend is available however disabled by default in sample
   configuration file
 
   For more documentation visit https://github.com/TimothyYe/godns
 EOM
 }
 ]