diff --git a/net/gerbera/Makefile b/net/gerbera/Makefile
index bb194e8d76dc..083c637c9aa9 100644
--- a/net/gerbera/Makefile
+++ b/net/gerbera/Makefile
@@ -1,101 +1,100 @@
 PORTNAME=	gerbera
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.2.1
 CATEGORIES=	net multimedia
 
 MAINTAINER=	diizzy@FreeBSD.org
 COMMENT=	Media server compatible with DLNA and UPnP
 WWW=		https://gerbera.io/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 BROKEN_i386=	error: non-constant-expression cannot be narrowed from type 'rep' (aka 'long long') to 'time_t' (aka 'int') in initializer list
 
 BUILD_DEPENDS=	cxxopts>0:devel/cxxopts
 LIB_DEPENDS=	libfmt.so:devel/libfmt \
 		libicui18n.so:devel/icu \
 		libjsoncpp.so:devel/jsoncpp \
 		libspdlog.so:devel/spdlog \
 		libpugixml.so:textproc/pugixml
 
 USES=		cmake compiler:c++17-lang iconv localbase:ldflags \
 		pkgconfig sqlite
 
 USE_GITHUB=	yes
 USE_RC_SUBR=	gerbera
 
 USERS=		gerbera
 GROUPS=		gerbera
 
-SUB_FILES=	pkg-message
 SUB_LIST=	USER=${USERS} GROUP=${GROUPS}
 
 PLIST_SUB=	USER=${USERS} GROUP=${GROUPS}
 
 CMAKE_OFF=	WITH_EXIF WITH_LASTFM WITH_MATROSKA WITH_MYSQL WITH_SYSTEMD \
 		WITH_ZIP
 CMAKE_ON=	WITH_MAGIC
 
 OPTIONS_DEFINE=		CURL DEBUG DUKTAPE EXIV2 FFMPEG FFMPEGTHUMBNAILER \
 			TAGLIB TEST
 OPTIONS_DEFAULT=	CURL DUKTAPE EXIV2 FFMPEG TAGLIB LIBNPUPNP
 
 OPTIONS_SINGLE=		UPNPLIB
 OPTIONS_SINGLE_UPNPLIB=	LIBNPUPNP LIBUPNP
 
 CURL_DESC=		Support for online services via cURL
 DUKTAPE_DESC=		Javascript support for custom import scripts
 FFMPEGTHUMBNAILER_DESC=	Support for thumbnail generation
 LIBNPUPNP_DESC=		Use high performance libnpupnp library
 LIBUPNP_DESC=		Use libupnp library
 TAGLIB_DESC=		Extract audio file metadata via taglib
 
 CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 CURL_CMAKE_BOOL=	WITH_CURL
 
 DEBUG_CMAKE_BOOL=	WITH_DEBUG
 
 DUKTAPE_LIB_DEPENDS=	libduktape.so:lang/duktape-lib
 DUKTAPE_CMAKE_BOOL=	WITH_JS
 
 EXIV2_LIB_DEPENDS=	libexiv2.so:graphics/exiv2
 EXIV2_CMAKE_BOOL=	WITH_EXIV2
 
 FFMPEGTHUMBNAILER_LIB_DEPENDS=	libffmpegthumbnailer.so:multimedia/ffmpegthumbnailer
 FFMPEGTHUMBNAILER_CMAKE_BOOL=	WITH_FFMPEGTHUMBNAILER
 FFMPEGTHUMBNAILER_IMPLIES=	FFMPEG
 
 FFMPEG_LIB_DEPENDS=	libavformat.so:multimedia/ffmpeg \
 			libavutil.so:multimedia/ffmpeg
 FFMPEG_CMAKE_BOOL=	WITH_AVCODEC
 
 LIBNPUPNP_LIB_DEPENDS=	libnpupnp.so:net/libnpupnp
 LIBNPUPNP_CMAKE_BOOL=	WITH_NPUPNP
 
 LIBUPNP_LIB_DEPENDS=	libupnp.so:devel/upnp
 
 TAGLIB_LIB_DEPENDS=	libtag.so:audio/taglib
 TAGLIB_CMAKE_BOOL=	WITH_TAGLIB
 
 TEST_BUILD_DEPENDS=	googletest>=0:devel/googletest
 TEST_CMAKE_BOOL=	WITH_TESTS
 TEST_TEST_TARGET=	test
 TEST_IMPLIES=		CURL DUKTAPE
 TEST_ENV=		LC_ALL=C.UTF-8 CTEST_PARALLEL_LEVEL=${MAKE_JOBS_NUMBER}
 
 .include <bsd.port.options.mk>
 
 .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1500050
 LIB_DEPENDS+=	libinotify.so:devel/libinotify
 .else
 EXTRA_PATCHES=	${PATCHDIR}/extra-patch-FreeBSD-15-inotify
 .endif
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/gerbera
 	@${MKDIR} ${STAGEDIR}/var/db/gerbera
 	@${MKDIR} ${STAGEDIR}/var/log/gerbera
 	@${STAGEDIR}${PREFIX}/bin/gerbera -f /var/db/gerbera --create-config > ${STAGEDIR}${PREFIX}/etc/gerbera-config.xml.sample
 
 .include <bsd.port.mk>
diff --git a/net/gerbera/files/gerbera.in b/net/gerbera/files/gerbera.in
index 9cbb7019fa29..6726da9578f0 100644
--- a/net/gerbera/files/gerbera.in
+++ b/net/gerbera/files/gerbera.in
@@ -1,51 +1,51 @@
 #!/bin/sh
 
 # PROVIDE: gerbera
 # REQUIRE: DAEMON
 # KEYWORD: shutdown
 
 #
 # Add the following line to /etc/rc.conf to enable gerbera:
 # gerbera_enable (bool):	Set to "NO" by default.
 #				Set it to "YES" to enable gerbera.
 # gerbera_flags (str):		Custom additional arguments to be passed
 #				to gerbera (default empty).
 # gerbera_conf_dir (str):	Directory where ${name} configuration
-#				data is stored.
+#				file is located.
 
 . /etc/rc.subr
 
 name="gerbera"
 rcvar=gerbera_enable
 
 load_rc_config ${name}
 
 : ${gerbera_enable:="NO"}
 : ${gerbera_user:="%%USER%%"}
 : ${gerbera_group:="%%GROUP%%"}
 : ${gerbera_conf_dir="%%PREFIX%%/etc"}
 
 start_precmd=gerbera_precmd
 stop_postcmd=gerbera_stop_postcmd
 
 procname="%%PREFIX%%/bin/${name}"
 pidfile="/var/run/gerbera/gerbera.pid"
 required_files="${gerbera_conf_dir}/gerbera-config.xml"
 
 command="/usr/sbin/daemon"
 command_args="-f -t ${name} -p ${pidfile} ${procname} -c ${required_files} -l /var/log/gerbera/gerbera.log ${gerbera_args}"
 
 gerbera_precmd()
 {
         local rundir=${pidfile%/*}
         if [ ! -d $rundir ] ; then
                 install -d -m 0755 -o %%USER%% -g %%GROUP%% $rundir
         fi
 }
 
 gerbera_stop_postcmd()
 {
 	rm -f "$rundir"
 }
 
 run_rc_command "$1"
diff --git a/net/gerbera/files/pkg-message.in b/net/gerbera/pkg-message
similarity index 75%
rename from net/gerbera/files/pkg-message.in
rename to net/gerbera/pkg-message
index ee03136d30a8..43db95b62500 100644
--- a/net/gerbera/files/pkg-message.in
+++ b/net/gerbera/pkg-message
@@ -1,11 +1,11 @@
 [
 { type: install
   message: <<EOM
   Edit /etc/rc.conf(.local) to start Gerbera automatically at system
   startup. Command line arguments can be set via gerbera_args.
 
-  A sample configuration file is installed at the follow location:
+  A sample configuration file is installed at the following location:
   %%PREFIX%%/etc/gerbera-config.xml.sample
 EOM
 }
 ]