diff --git a/www/bacula-web/Makefile b/www/bacula-web/Makefile
index 188be63d9fe2..7e6c81247f3d 100644
--- a/www/bacula-web/Makefile
+++ b/www/bacula-web/Makefile
@@ -1,56 +1,57 @@
 PORTNAME=	bacula-web
 DISTVERSIONPREFIX=	v
 DISTVERSION=	8.7.0
+PORTREVISION=	1
 CATEGORIES=	www sysutils
 PKGNAMESUFFIX=	${PHP_PKGNAMESUFFIX}
 
 MAINTAINER=	ler@FreeBSD.org
 COMMENT=	Bacula-web provides a summarized output of Bacula jobs
 WWW=		https://www.bacula-web.org/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${LOCALBASE}/bin/composer:devel/php-composer@${PHP_FLAVOR}
 
 USES=		php:web,flavors
 USE_PHP=	dom gd gettext posix session simplexml tokenizer xml xmlwriter
 USE_GITHUB=	yes
 NO_BUILD=	yes
 NO_ARCH=	yes
 SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=		MYSQL PGSQL SQLITE
 OPTIONS_DEFAULT=	MYSQL PGSQL SQLITE
 
 SQLITE_USES=	sqlite
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MMYSQL}
 USES+=			mysql
 CONFIGURE_ARGS+=	--with-mysql=yes
 SUB_LIST+=		REQ_MYSQL=mysql
 USE_PHP+=		pdo_mysql
 .endif
 
 .if ${PORT_OPTIONS:MPGSQL}
 USES+=	pgsql
 CONFIGURE_ARGS+=	--with-postgresql=yes
 SUB_LIST+=		REQ_PGSQL=postgresql
 USE_PHP+=		pdo_pgsql
 .endif
 
 .if ${PORT_OPTIONS:MSQLITE}
 CONFIGURE_ARGS+=	--with-sqlite=yes
 SUB_LIST+=		REQ_SQLITE=sqlite
 USE_PHP+=		pdo_sqlite sqlite3
 .endif
 
 do-install:
 	# Maybe we should delete some files
 	${FIND} ${WRKSRC} -name '*.orig' -delete
 	@${ECHO} "Installing in ${WWWDIR}"
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/www/${PORTNAME})
 
 .include <bsd.port.mk>
diff --git a/www/bacula-web/pkg-plist b/www/bacula-web/pkg-plist
index ab5204898629..2edc88dab6ac 100644
--- a/www/bacula-web/pkg-plist
+++ b/www/bacula-web/pkg-plist
@@ -1,143 +1,203 @@
 @dir(,,744) %%WWWDIR%%/application/assets/protected
 @dir(,,744) %%WWWDIR%%/application/views/cache
 @group www
 @owner www
 @sample %%WWWDIR%%/application/config/config.php.sample
+%%WWWDIR%%/.github/FUNDING.yml
 %%WWWDIR%%/.github/ISSUE_TEMPLATE/bug_report.md
 %%WWWDIR%%/.github/workflows/ci.yaml
 %%WWWDIR%%/.htaccess
 %%WWWDIR%%/.phpcs.xml
 %%WWWDIR%%/.readthedocs.yaml
 %%WWWDIR%%/.tx/config
 %%WWWDIR%%/CODE_OF_CONDUCT.md
 %%WWWDIR%%/CONTRIBUTING.md
 %%WWWDIR%%/LICENSE
 %%WWWDIR%%/README.md
+%%WWWDIR%%/SECURITY.md
+%%WWWDIR%%/application/Controller/BackupJobController.php
+%%WWWDIR%%/application/Controller/ClientController.php
+%%WWWDIR%%/application/Controller/DirectorController.php
+%%WWWDIR%%/application/Controller/HomeController.php
+%%WWWDIR%%/application/Controller/JobController.php
+%%WWWDIR%%/application/Controller/JobFilesController.php
+%%WWWDIR%%/application/Controller/JobLogController.php
+%%WWWDIR%%/application/Controller/LoginController.php
+%%WWWDIR%%/application/Controller/PoolController.php
+%%WWWDIR%%/application/Controller/SettingsController.php
+%%WWWDIR%%/application/Controller/TestController.php
+%%WWWDIR%%/application/Controller/UserController.php
+%%WWWDIR%%/application/Controller/VolumeController.php
+%%WWWDIR%%/application/Controller/VolumesController.php
 %%WWWDIR%%/application/Entity/Job.php
+%%WWWDIR%%/application/Entity/Log.php
+%%WWWDIR%%/application/Entity/User.php
+%%WWWDIR%%/application/Entity/Volume.php
+%%WWWDIR%%/application/Middleware/DbAuthMiddleware.php
+%%WWWDIR%%/application/Middleware/ExceptionMiddleware.php
+%%WWWDIR%%/application/Middleware/RouterMiddleware.php
 %%WWWDIR%%/application/assets/css/default.css
 %%WWWDIR%%/application/assets/images/bacula-web-logo.png
 %%WWWDIR%%/application/assets/js/default.js
 %%WWWDIR%%/application/assets/js/ie10-viewport-bug-workaround.js
 %%WWWDIR%%/application/assets/protected/.htaccess
 %%WWWDIR%%/application/config/.htaccess
 %%WWWDIR%%/application/config/application.php
+%%WWWDIR%%/application/libs/FileConfig.php
 %%WWWDIR%%/application/locale/be/LC_MESSAGES/messages.mo
 %%WWWDIR%%/application/locale/be/LC_MESSAGES/messages.po
 %%WWWDIR%%/application/locale/be_BY/LC_MESSAGES/messages.mo
 %%WWWDIR%%/application/locale/be_BY/LC_MESSAGES/messages.po
 %%WWWDIR%%/application/locale/ca/LC_MESSAGES/messages.mo
 %%WWWDIR%%/application/locale/ca/LC_MESSAGES/messages.po
 %%WWWDIR%%/application/locale/ca_ES/LC_MESSAGES/messages.mo
 %%WWWDIR%%/application/locale/ca_ES/LC_MESSAGES/messages.po
 %%WWWDIR%%/application/locale/de_DE/LC_MESSAGES/messages.mo
 %%WWWDIR%%/application/locale/de_DE/LC_MESSAGES/messages.po
 %%WWWDIR%%/application/locale/en_EN/LC_MESSAGES/messages.mo
 %%WWWDIR%%/application/locale/en_EN/LC_MESSAGES/messages.po
 %%WWWDIR%%/application/locale/es_ES/LC_MESSAGES/messages.mo
 %%WWWDIR%%/application/locale/es_ES/LC_MESSAGES/messages.po
 %%WWWDIR%%/application/locale/fr_FR/LC_MESSAGES/messages.mo
 %%WWWDIR%%/application/locale/fr_FR/LC_MESSAGES/messages.po
 %%WWWDIR%%/application/locale/it_IT/LC_MESSAGES/messages.mo
 %%WWWDIR%%/application/locale/it_IT/LC_MESSAGES/messages.po
 %%WWWDIR%%/application/locale/ja_JP/LC_MESSAGES/messages.mo
 %%WWWDIR%%/application/locale/ja_JP/LC_MESSAGES/messages.po
 %%WWWDIR%%/application/locale/nl_NL/LC_MESSAGES/messages.mo
 %%WWWDIR%%/application/locale/nl_NL/LC_MESSAGES/messages.po
 %%WWWDIR%%/application/locale/no_NO/LC_MESSAGES/messages.mo
 %%WWWDIR%%/application/locale/no_NO/LC_MESSAGES/messages.po
 %%WWWDIR%%/application/locale/pl/LC_MESSAGES/messages.mo
 %%WWWDIR%%/application/locale/pl/LC_MESSAGES/messages.po
 %%WWWDIR%%/application/locale/pl_PL/LC_MESSAGES/messages.mo
 %%WWWDIR%%/application/locale/pl_PL/LC_MESSAGES/messages.po
 %%WWWDIR%%/application/locale/pt_BR/LC_MESSAGES/messages.mo
 %%WWWDIR%%/application/locale/pt_BR/LC_MESSAGES/messages.po
 %%WWWDIR%%/application/locale/ro_RO/LC_MESSAGES/messages.mo
 %%WWWDIR%%/application/locale/ro_RO/LC_MESSAGES/messages.po
 %%WWWDIR%%/application/locale/ru_RU/LC_MESSAGES/messages.mo
 %%WWWDIR%%/application/locale/ru_RU/LC_MESSAGES/messages.po
 %%WWWDIR%%/application/locale/sv_SE/LC_MESSAGES/messages.mo
 %%WWWDIR%%/application/locale/sv_SE/LC_MESSAGES/messages.po
 %%WWWDIR%%/application/locale/zh_CN/LC_MESSAGES/messages.mo
 %%WWWDIR%%/application/locale/zh_CN/LC_MESSAGES/messages.po
 %%WWWDIR%%/application/tables/CatalogTable.php
 %%WWWDIR%%/application/tables/ClientTable.php
 %%WWWDIR%%/application/tables/FileSetTable.php
 %%WWWDIR%%/application/tables/JobFileTable.php
 %%WWWDIR%%/application/tables/JobTable.php
 %%WWWDIR%%/application/tables/LogTable.php
 %%WWWDIR%%/application/tables/PoolTable.php
 %%WWWDIR%%/application/tables/UserTable.php
 %%WWWDIR%%/application/tables/VolumeTable.php
 %%WWWDIR%%/application/views/cache/README
 %%WWWDIR%%/application/views/templates/layouts/default.tpl
+%%WWWDIR%%/application/views/templates/pages/backupjob-report.tpl
+%%WWWDIR%%/application/views/templates/pages/client-report.tpl
+%%WWWDIR%%/application/views/templates/pages/dashboard.tpl
+%%WWWDIR%%/application/views/templates/pages/directors.tpl
+%%WWWDIR%%/application/views/templates/pages/jobfiles.tpl
+%%WWWDIR%%/application/views/templates/pages/joblogs.tpl
+%%WWWDIR%%/application/views/templates/pages/jobs.tpl
+%%WWWDIR%%/application/views/templates/pages/login.tpl
+%%WWWDIR%%/application/views/templates/pages/pools.tpl
+%%WWWDIR%%/application/views/templates/pages/settings.tpl
+%%WWWDIR%%/application/views/templates/pages/test.tpl
+%%WWWDIR%%/application/views/templates/pages/usersettings.tpl
+%%WWWDIR%%/application/views/templates/pages/volume.tpl
+%%WWWDIR%%/application/views/templates/pages/volumes.tpl
+%%WWWDIR%%/application/views/templates/partials/footer.tpl
+%%WWWDIR%%/application/views/templates/partials/html-footer.tpl
+%%WWWDIR%%/application/views/templates/partials/html-head.tpl
+%%WWWDIR%%/application/views/templates/partials/navbar.tpl
+%%WWWDIR%%/application/views/templates/partials/pagination.tpl
 %%WWWDIR%%/bwc
 %%WWWDIR%%/composer.json
 %%WWWDIR%%/console.php
+%%WWWDIR%%/core/App/Controller.php
+%%WWWDIR%%/core/App/UserAuth.php
+%%WWWDIR%%/core/App/View.php
+%%WWWDIR%%/core/App/WebApplication.php
+%%WWWDIR%%/core/Exception/AppException.php
+%%WWWDIR%%/core/Exception/ConfigFileException.php
+%%WWWDIR%%/core/Exception/DatabaseException.php
+%%WWWDIR%%/core/Exception/NotAuthenticatedException.php
 %%WWWDIR%%/core/Exception/NotAuthorizedException.php
 %%WWWDIR%%/core/Exception/PageNotFoundException.php
+%%WWWDIR%%/core/Exception/UserAuthenticatedException.php
+%%WWWDIR%%/core/Middleware/MiddlewareInterface.php
 %%WWWDIR%%/core/bootstrap.php
 %%WWWDIR%%/core/const.inc.php
 %%WWWDIR%%/core/db/Database.php
 %%WWWDIR%%/core/db/DatabaseFactory.php
 %%WWWDIR%%/core/db/Table.php
 %%WWWDIR%%/core/db/cdbpagination.class.php
 %%WWWDIR%%/core/db/cdbquery.class.php
 %%WWWDIR%%/core/graph/chart.class.php
 %%WWWDIR%%/core/helpers/sanitizer.php
 %%WWWDIR%%/core/i18n/ctranslation.class.php
+%%WWWDIR%%/core/utils/ExceptionRenderer.php
 %%WWWDIR%%/core/utils/cutils.class.php
 %%WWWDIR%%/core/utils/datetimeutil.class.php
 %%WWWDIR%%/core/utils/file.class.php
 %%WWWDIR%%/core/utils/htmlhelper.class.php
 %%WWWDIR%%/docs/CHANGELOG.md
 %%WWWDIR%%/docs/Makefile
 %%WWWDIR%%/docs/requirements.txt
 %%WWWDIR%%/docs/source/01_about/about.rst
 %%WWWDIR%%/docs/source/01_about/features.rst
 %%WWWDIR%%/docs/source/01_about/index.rst
 %%WWWDIR%%/docs/source/01_about/license.rst
 %%WWWDIR%%/docs/source/01_about/release.rst
+%%WWWDIR%%/docs/source/01_about/security.rst
 %%WWWDIR%%/docs/source/02_install/apache-installation.rst
 %%WWWDIR%%/docs/source/02_install/configure.rst
 %%WWWDIR%%/docs/source/02_install/finalize.rst
 %%WWWDIR%%/docs/source/02_install/index.rst
 %%WWWDIR%%/docs/source/02_install/installarchive.rst
 %%WWWDIR%%/docs/source/02_install/installcomposer.rst
 %%WWWDIR%%/docs/source/02_install/lighttpd-installation.rst
 %%WWWDIR%%/docs/source/02_install/nginx-installation.rst
 %%WWWDIR%%/docs/source/02_install/requirements.rst
 %%WWWDIR%%/docs/source/02_install/test.rst
 %%WWWDIR%%/docs/source/02_install/upgrade.rst
+%%WWWDIR%%/docs/source/03_get-help/faq.rst
+%%WWWDIR%%/docs/source/03_get-help/index.rst
+%%WWWDIR%%/docs/source/03_get-help/support.rst
 %%WWWDIR%%/docs/source/04_contribute/development.rst
 %%WWWDIR%%/docs/source/04_contribute/index.rst
 %%WWWDIR%%/docs/source/04_contribute/translations.rst
 %%WWWDIR%%/docs/source/_static/bacula-web-backupjob-report.jpg
 %%WWWDIR%%/docs/source/_static/bacula-web-client-report.jpg
+%%WWWDIR%%/docs/source/_static/bacula-web-dashboard-crop.jpeg
 %%WWWDIR%%/docs/source/_static/bacula-web-dashboard.jpg
 %%WWWDIR%%/docs/source/_static/bacula-web-directors.jpg
 %%WWWDIR%%/docs/source/_static/bacula-web-job-logs-option.jpg
 %%WWWDIR%%/docs/source/_static/bacula-web-job-logs.jpg
 %%WWWDIR%%/docs/source/_static/bacula-web-jobfiles.jpg
 %%WWWDIR%%/docs/source/_static/bacula-web-jobs-report-options.jpg
 %%WWWDIR%%/docs/source/_static/bacula-web-jobs-report.jpg
 %%WWWDIR%%/docs/source/_static/bacula-web-logo.png
 %%WWWDIR%%/docs/source/_static/bacula-web-pools.jpg
 %%WWWDIR%%/docs/source/_static/bacula-web-settings-menu.jpg
 %%WWWDIR%%/docs/source/_static/bacula-web-settings.jpg
 %%WWWDIR%%/docs/source/_static/bacula-web-test-page.jpg
 %%WWWDIR%%/docs/source/_static/bacula-web-user-settings-menu.jpg
 %%WWWDIR%%/docs/source/_static/bacula-web-user-settings.jpg
 %%WWWDIR%%/docs/source/_static/bacula-web-users.jpg
+%%WWWDIR%%/docs/source/_static/bacula-web-volume-details.jpg
 %%WWWDIR%%/docs/source/_static/bacula-web-volumes.jpg
 %%WWWDIR%%/docs/source/_static/custom.css
 %%WWWDIR%%/docs/source/conf.py
 %%WWWDIR%%/docs/source/index.rst
 %%WWWDIR%%/phpunit.xml
 %%WWWDIR%%/public/.htaccess
 %%WWWDIR%%/public/css/.gitkeep
 %%WWWDIR%%/public/fonts/.gitkeep
 %%WWWDIR%%/public/img/.gitkeep
 %%WWWDIR%%/public/index.php
 %%WWWDIR%%/public/js/.gitkeep
+%%WWWDIR%%/public/webfonts/.gitkeep
 %%WWWDIR%%/sonar-project.properties
 %%WWWDIR%%/tests/DateTimeUtilTest.php