diff --git a/www/tinyauth/Makefile b/www/tinyauth/Makefile
index 7176879c5982..8d8de92dbc9f 100644
--- a/www/tinyauth/Makefile
+++ b/www/tinyauth/Makefile
@@ -1,59 +1,61 @@
 PORTNAME=	tinyauth
 DISTVERSIONPREFIX=	v
-DISTVERSION=	4.0.1
-PORTREVISION=	6
+DISTVERSION=	5.0.4
 CATEGORIES=	www
-MASTER_SITES=	LOCAL/dtxdf/${PORTNAME}/
+MASTER_SITES=	LOCAL/dtxdf/${PORTNAME}/:assets
 # For instructions on how to create assets:
 #   https://github.com/DtxdF/port-assets-makejails/tree/main/tinyauth
-DISTFILES=	${PORTNAME}-${DISTVERSIONPREFIX}${DISTVERSION}.frontend${EXTRACT_SUFX}
+DISTFILES=	${PORTNAME}-${DISTVERSIONPREFIX}${DISTVERSION}.frontend${EXTRACT_SUFX}:assets \
+		${PORTNAME}-${DISTVERSIONPREFIX}${DISTVERSION}.vendor${EXTRACT_SUFX}:assets
 
 MAINTAINER=	dtxdf@FreeBSD.org
 COMMENT=	Simplest way to protect your apps with a login screen
 WWW=		https://tinyauth.app
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 ONLY_FOR_ARCHS=	aarch64 amd64
 ONLY_FOR_ARCHS_REASON=	module modernc.org/sqlite only supported on aarch64 and amd64
 
-USES=		go:modules
+USES=		go:1.25+,modules
 USE_GITHUB=	yes
 GH_ACCOUNT=	steveiliop56
 
 USE_RC_SUBR=	${PORTNAME}
 
 GO_MOD_DIST=	github
-GO_MODULE=	github.com/steveiliop56/${PORTNAME}
+GO_TARGET=		./cmd/${PORTNAME}
 GO_BUILDFLAGS=	-ldflags "\
 			-X 'tinyauth/internal/constants.Version=${DISTVERSIONPREFIX}${DISTVERSION}' \
 			-X 'tinyauth/internal/constants.CommitHash=${GITID}' \
 			-X 'tinyauth/internal/constants.BuildTimestamp=${BUILD_DATE}'"
 
 SUB_FILES=	pkg-message
 SUB_LIST=	USER=${USERS:[1]}
 
 USERS=		${TINYAUTH_USER}
 GROUPS=		${TINYAUTH_GROUP}
 
 PLIST_FILES=	bin/${PORTNAME} \
 		"@dir(${TINYAUTH_USER},${TINYAUTH_GROUP},0750) /var/db/${PORTNAME}"
 
 # Run 'git checkout ${DISTVERSIONPREFIX}${DISTVERSION} && git rev-parse HEAD'
 # in the Tinyauth repository to get the value of GITID.
-GITID=		5f7f88421ee0d2cc8fd17316fa378b958386a000
+GITID=		03f13efc77554e5b7f52fa419912d24b0a5f2648
 
 BUILD_DATE=	$$(date -u '+%Y-%m-%dT%H:%M:%S')
 
 TINYAUTH_USER=	${PORTNAME}
 TINYAUTH_GROUP=	${TINYAUTH_USER}
 
-pre-build:
+post-extract:
+	@${MKDIR} ${WRKSRC}/vendor
+	@cd ${WRKDIR}/${PORTNAME}-vendor && ${COPYTREE_SHARE} . ${WRKSRC}/vendor
 	@${MKDIR} ${WRKSRC}/internal/assets/dist
-	@cd ${WRKDIR}/tinyauth-frontend && ${COPYTREE_SHARE} . ${WRKSRC}/internal/assets/dist
+	@cd ${WRKDIR}/${PORTNAME}-frontend && ${COPYTREE_SHARE} . ${WRKSRC}/internal/assets/dist
 
 post-install:
 	@${MKDIR} ${STAGEDIR}/var/db/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/www/tinyauth/distinfo b/www/tinyauth/distinfo
index 471101b17185..35d69f387d9a 100644
--- a/www/tinyauth/distinfo
+++ b/www/tinyauth/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1762061106
-SHA256 (go/www_tinyauth/steveiliop56-tinyauth-v4.0.1_GH0/tinyauth-v4.0.1.frontend.tar.gz) = 46544b559e44281d49834da912f5865c45dc233fca0f8a5945637e5a9461a6be
-SIZE (go/www_tinyauth/steveiliop56-tinyauth-v4.0.1_GH0/tinyauth-v4.0.1.frontend.tar.gz) = 957533
-SHA256 (go/www_tinyauth/steveiliop56-tinyauth-v4.0.1_GH0/go.mod) = 08befbc397aa156c2a67aa1ab3ea504c1db61586270079f555b8c17d08ecc780
-SIZE (go/www_tinyauth/steveiliop56-tinyauth-v4.0.1_GH0/go.mod) = 6266
-SHA256 (go/www_tinyauth/steveiliop56-tinyauth-v4.0.1_GH0/steveiliop56-tinyauth-v4.0.1_GH0.tar.gz) = f078d50b2c539ad1ff6eec3abe64ad6ce2e65c377e72aedb13901d57ec668bf0
-SIZE (go/www_tinyauth/steveiliop56-tinyauth-v4.0.1_GH0/steveiliop56-tinyauth-v4.0.1_GH0.tar.gz) = 5650185
+TIMESTAMP = 1774567833
+SHA256 (tinyauth-v5.0.4.frontend.tar.gz) = b1c45453e96b11bebd9c5783fa8e510da8316bff7d4f0f425cd5ccb63a72dca5
+SIZE (tinyauth-v5.0.4.frontend.tar.gz) = 1009761
+SHA256 (tinyauth-v5.0.4.vendor.tar.gz) = b89857ec1f62f61f6d4e248c8edd98177bf374e407f7692c3e7780211a6dccab
+SIZE (tinyauth-v5.0.4.vendor.tar.gz) = 57837513
+SHA256 (steveiliop56-tinyauth-v5.0.4_GH0.tar.gz) = 7b878e9a7014e09b4b4cc886b920e8dde41b2858f441d0eb542e246d3dee4ddd
+SIZE (steveiliop56-tinyauth-v5.0.4_GH0.tar.gz) = 4787573
diff --git a/www/tinyauth/files/pkg-message.in b/www/tinyauth/files/pkg-message.in
index 7125da4a7373..c891ac62e76b 100644
--- a/www/tinyauth/files/pkg-message.in
+++ b/www/tinyauth/files/pkg-message.in
@@ -1,30 +1,55 @@
 [
 { type: install
   message: <<EOM
 Tinyauth is installed
 
 1) Configure it in %%PREFIX%%/etc/tinyauth.env
 
+   1.1) If you just want to see a quick demo, add an entry to the
+        hosts(5) file on the client that will connect to tinyauth,
+        something like this:
+
+     127.0.0.1    tinyauth.example.localhost
+
+   1.2) Next, create a user:
+
+     su -m tinyauth -c 'tinyauth user create --interactive'
+
+   1.3) Add the result to %%PREFIX%%/etc/tinyauth.env, escaping any
+        dollar signs:
+
+     TINYAUTH_APPURL=http://tinyauth.example.localhost:3000
+     TINYAUTH_AUTH_USERS="user:\$2a\$10\$n3t.jAIhfTHT1x/iROffGel9OQeEKh74sETmyf7XikZKLHfASRJ8K"
+
 2) Enable it with
 
      sysrc tinyauth_enable=YES
 
 3) Start it with
 
      service tinyauth start
 EOM
 }
 { type: upgrade
   maximum_version: "4.0.0"
   message: <<EOM
 Since version 4.0.0, Tinyauth is a stateful application, which means you must set
 DATABASE_PATH to /var/db/tinyauth/tinyauth.db if you want sessions to persist even
 after restarting.
 
 Please refer to the current documentation for any changes you
 need to make to your configuration file:
 
   https://tinyauth.app/docs/breaking-updates/3-to-4/
 EOM
 }
+{ type: upgrade
+  maximum_version: "5.0.0"
+  message: <<EOM
+This release introduces some breaking-changes, please refer to the documentation
+for migration instructions:
+
+  https://tinyauth.app/docs/breaking-updates/4-to-5
+EOM
+}
 ]
diff --git a/www/tinyauth/files/tinyauth.in b/www/tinyauth/files/tinyauth.in
index 00e28e49e60e..35d0d05f8687 100644
--- a/www/tinyauth/files/tinyauth.in
+++ b/www/tinyauth/files/tinyauth.in
@@ -1,35 +1,39 @@
 #!/bin/sh
 
 # PROVIDE: tinyauth
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
 #
 # Configuration settings for tinyauth in /etc/rc.conf
 #
-# tinyauth_enable (bool):         Enable tinyauth. (Default=NO)
-# tinyauth_env_file (str):        Path containing the environment variables
-#                                 to be used by tinyauth. (Default: %%PREFIX%%/etc/tinyauth.env)
-# tinyauth_logfile (str):         Log file used to store the tinyauth's output. (Default: /var/log/tinyauth.log)
-# tinyauth_pidfile (str):         File used by tinyauth to store the process ID. (Default: /var/run/tinyauth.pid)
-# tinyauth_runas (str):           User to run tinyauth as. (Default: %%USER%%)
+# tinyauth_enable (bool):         Enable tinyauth. (default=NO)
+# tinyauth_chdir (str)            Run tinyauth in this directory. (default=/var/db/tinyauth)
+# tinyauth_env_file (str):        Path containing the environment variables to be used by tinyauth.
+#                                 (default=%%PREFIX%%/etc/tinyauth.env)
+# tinyauth_logfile (str):         Log file used to store the tinyauth's output.
+#                                 (default=/var/log/tinyauth.log)
+# tinyauth_pidfile (str):         File used by tinyauth to store the process ID.
+#                                 (default=/var/run/tinyauth.pid)
+# tinyauth_runas (str):           User to run tinyauth as. (default=%%USER%%)
 
 . /etc/rc.subr
 
 name="tinyauth"
 desc="Simplest way to protect your apps with a login screen"
 rcvar="tinyauth_enable"
 
 load_rc_config $name
 
 : ${tinyauth_enable:="NO"}
+: ${tinyauth_chdir:="/var/db/tinyauth"}
 : ${tinyauth_env_file:="%%PREFIX%%/etc/tinyauth.env"}
 : ${tinyauth_logfile:="/var/log/tinyauth.log"}
 : ${tinyauth_pidfile:="/var/run/tinyauth.pid"}
 : ${tinyauth_runas:="%%USER%%"}
 
 pidfile="${tinyauth_pidfile}"
 procname="%%LOCALBASE%%/bin/tinyauth"
 command="/usr/sbin/daemon"
 command_args="-o '${tinyauth_logfile}' -p '${pidfile}' -u '${tinyauth_runas}' -t '${desc}' -- '${procname}'"
 
 run_rc_command "$1"