diff --git a/www/filebrowser/Makefile b/www/filebrowser/Makefile
index 1c8769b064c3..8ad8a5f2a542 100644
--- a/www/filebrowser/Makefile
+++ b/www/filebrowser/Makefile
@@ -1,52 +1,51 @@
 PORTNAME=	filebrowser
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.55.0
-PORTREVISION=	2
+DISTVERSION=	2.58.0
 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/filebrowser
-DISTFILES=	${PORTNAME}-${DISTVERSIONPREFIX}${DISTVERSION}.frontend${EXTRACT_SUFX}
+DISTFILES=	${PORTNAME}-${DISTVERSIONPREFIX}${DISTVERSION}.frontend${EXTRACT_SUFX}:assets
 
 MAINTAINER=	dtxdf@FreeBSD.org
 COMMENT=	Web File Browser
 WWW=		https://filebrowser.org
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		go:modules
 USE_GITHUB=	yes
 
 USE_RC_SUBR=	${PORTNAME}
 
 GO_MOD_DIST=	github
 GO_MODULE=	github.com/filebrowser/${PORTNAME}
 GO_BUILDFLAGS=	-ldflags "\
 			-X 'github.com/filebrowser/${PORTNAME}/v2/version.Version=${DISTVERSION}' \
 			-X 'github.com/filebrowser/${PORTNAME}/v2/version.CommitSHA=${GITID}'"
 
 SUB_LIST=	USER=${USERS:[1]}
 
 USERS=		${FILEBROWSER_USER}
 GROUPS=		${FILEBROWSER_GROUP}
 
 PLIST_SUB=	GROUP=${GROUPS:[1]} \
 		USER=${USERS:[1]}
 
 # Run 'git checkout ${DISTVERSIONPREFIX}${DISTVERSION} && git rev-parse HEAD'
 # in the File Browser repository to get the value of GITID.
-GITID=		08c8ede587240472cd1524e40e514fc2bbc3466e
+GITID=		95e6ed75a73a0dd0e98ab8984d873223b9594bed
 
 FILEBROWSER_USER=	${PORTNAME}
 FILEBROWSER_GROUP=	${FILEBROWSER_USER}
 
 pre-build:
 	@cd ${WRKDIR}/filebrowser-frontend && ${COPYTREE_SHARE} . ${WRKSRC}/frontend/dist
 
 post-install:
 .for dir in run log db
 	@${MKDIR} ${STAGEDIR}/var/${dir}/${PORTNAME}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/www/filebrowser/distinfo b/www/filebrowser/distinfo
index 130ce4af7b73..054be2b180ac 100644
--- a/www/filebrowser/distinfo
+++ b/www/filebrowser/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1768762056
-SHA256 (go/www_filebrowser/filebrowser-filebrowser-v2.55.0_GH0/filebrowser-v2.55.0.frontend.tar.gz) = 13cb901aa95b62b68a80911d35bf5b29acb81ca15ec7f80354376457bed15d10
-SIZE (go/www_filebrowser/filebrowser-filebrowser-v2.55.0_GH0/filebrowser-v2.55.0.frontend.tar.gz) = 3827005
-SHA256 (go/www_filebrowser/filebrowser-filebrowser-v2.55.0_GH0/go.mod) = c86c47df7fb122a2da9313841541620f9fd952f95ff60a6ed479a0e266e667ab
-SIZE (go/www_filebrowser/filebrowser-filebrowser-v2.55.0_GH0/go.mod) = 3491
-SHA256 (go/www_filebrowser/filebrowser-filebrowser-v2.55.0_GH0/filebrowser-filebrowser-v2.55.0_GH0.tar.gz) = 8a857d5ae7eac27c3a957610f0671943ba780ef947f15b83dfa7776f92495dbe
-SIZE (go/www_filebrowser/filebrowser-filebrowser-v2.55.0_GH0/filebrowser-filebrowser-v2.55.0_GH0.tar.gz) = 5380928
+TIMESTAMP = 1771120892
+SHA256 (go/www_filebrowser/filebrowser-filebrowser-v2.58.0_GH0/filebrowser-v2.58.0.frontend.tar.gz) = 4ef6ba9f1aa217ba88f4b11ab9d2783e39d424c83119dbd124ae067113902641
+SIZE (go/www_filebrowser/filebrowser-filebrowser-v2.58.0_GH0/filebrowser-v2.58.0.frontend.tar.gz) = 3939968
+SHA256 (go/www_filebrowser/filebrowser-filebrowser-v2.58.0_GH0/go.mod) = 46108da0d168920a16133aced0dd18c9214ff68b6710787cd009e61bf8d1e78a
+SIZE (go/www_filebrowser/filebrowser-filebrowser-v2.58.0_GH0/go.mod) = 3658
+SHA256 (go/www_filebrowser/filebrowser-filebrowser-v2.58.0_GH0/filebrowser-filebrowser-v2.58.0_GH0.tar.gz) = 6b8a089ac045650aadf06e0f5024493dba6b09b11153a56ce816cf72d291aa14
+SIZE (go/www_filebrowser/filebrowser-filebrowser-v2.58.0_GH0/filebrowser-filebrowser-v2.58.0_GH0.tar.gz) = 5388647