diff --git a/www/bacula-web/Makefile b/www/bacula-web/Makefile
index bfc4f796770f..9e947d7c2cb9 100644
--- a/www/bacula-web/Makefile
+++ b/www/bacula-web/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	bacula-web
 DISTVERSIONPREFIX=	v
-DISTVERSION=	8.4.3
+DISTVERSION=	8.5.0
 PORTREVISION=	0
 CATEGORIES=	www sysutils
 PKGNAMESUFFIX=	${PHP_PKGNAMESUFFIX}
@@ -16,7 +16,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 RUN_DEPENDS=	${LOCALBASE}/bin/composer:devel/php-composer@${PHP_FLAVOR}
 
 USES=		php:web,flavors
-USE_PHP=	dom gd gettext session simplexml tokenizer xml xmlwriter
+USE_PHP=	dom gd gettext posix session simplexml tokenizer xml xmlwriter
 USE_GITHUB=	yes
 NO_BUILD=	yes
 NO_ARCH=	yes
diff --git a/www/bacula-web/distinfo b/www/bacula-web/distinfo
index fb1ae1cd407c..73315b78bb9e 100644
--- a/www/bacula-web/distinfo
+++ b/www/bacula-web/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1633410259
-SHA256 (bacula-web-bacula-web-v8.4.3_GH0.tar.gz) = c8952f030744cd2926d9f1f9cefaeb9f399fe7f7d9b70e4e36a0f64cc01e625f
-SIZE (bacula-web-bacula-web-v8.4.3_GH0.tar.gz) = 1748846
+TIMESTAMP = 1638667861
+SHA256 (bacula-web-bacula-web-v8.5.0_GH0.tar.gz) = e3b5683c565bcf014c33c580a73648c0c3e95ed361d8aa062282c60a605b9476
+SIZE (bacula-web-bacula-web-v8.5.0_GH0.tar.gz) = 3378698
diff --git a/www/bacula-web/pkg-plist b/www/bacula-web/pkg-plist
index 631c18acbe6e..6290d90bb718 100644
--- a/www/bacula-web/pkg-plist
+++ b/www/bacula-web/pkg-plist
@@ -2,13 +2,13 @@
 %%WWWDIR%%/.csslintrc
 %%WWWDIR%%/.eslintignore
 %%WWWDIR%%/.eslintrc.yml
+%%WWWDIR%%/.github/ISSUE_TEMPLATE/bug_report.md
+%%WWWDIR%%/.github/workflows/build.yml
 %%WWWDIR%%/.htaccess
+%%WWWDIR%%/.readthedocs.yaml
 %%WWWDIR%%/CONTRIBUTING.md
 %%WWWDIR%%/LICENSE
 %%WWWDIR%%/README.md
-%%WWWDIR%%/bwc
-%%WWWDIR%%/composer.json
-%%WWWDIR%%/composer.lock
 %%WWWDIR%%/application/assets/css/default.css
 %%WWWDIR%%/application/assets/images/bacula-web-logo.png
 %%WWWDIR%%/application/assets/js/default.js
@@ -76,6 +76,7 @@
 %%WWWDIR%%/application/views/templates/jobs.tpl
 %%WWWDIR%%/application/views/templates/layouts/default.tpl
 %%WWWDIR%%/application/views/templates/login.tpl
+%%WWWDIR%%/application/views/templates/pagination.tpl
 %%WWWDIR%%/application/views/templates/pools.tpl
 %%WWWDIR%%/application/views/templates/settings.tpl
 %%WWWDIR%%/application/views/templates/test.tpl
@@ -84,6 +85,9 @@
 %%WWWDIR%%/application/views/test.view.php
 %%WWWDIR%%/application/views/usersettings.view.php
 %%WWWDIR%%/application/views/volumes.view.php
+%%WWWDIR%%/bwc
+%%WWWDIR%%/composer.json
+%%WWWDIR%%/composer.lock
 %%WWWDIR%%/console.php
 %%WWWDIR%%/core/app/cerrorhandler.class.php
 %%WWWDIR%%/core/app/cmodel.class.php
@@ -93,6 +97,7 @@
 %%WWWDIR%%/core/bweb.class.php
 %%WWWDIR%%/core/const.inc.php
 %%WWWDIR%%/core/db/cdb.class.php
+%%WWWDIR%%/core/db/cdbpagination.class.php
 %%WWWDIR%%/core/db/cdbquery.class.php
 %%WWWDIR%%/core/db/cdbresult.class.php
 %%WWWDIR%%/core/db/cdbutils.class.php
@@ -104,20 +109,20 @@
 %%WWWDIR%%/core/utils/datetimeutil.class.php
 %%WWWDIR%%/core/utils/file.class.php
 %%WWWDIR%%/core/utils/htmlhelper.class.php
-%%WWWDIR%%/docs/Changelog
+%%WWWDIR%%/docs/CHANGELOG.md
+%%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/02_install/apache-installation.rst
 %%WWWDIR%%/docs/source/02_install/configure.rst
-%%WWWDIR%%/docs/source/02_install/configwebserver.rst
 %%WWWDIR%%/docs/source/02_install/finalize.rst
 %%WWWDIR%%/docs/source/02_install/index.rst
-%%WWWDIR%%/docs/source/02_install/install.rst
 %%WWWDIR%%/docs/source/02_install/installarchive.rst
 %%WWWDIR%%/docs/source/02_install/installcomposer.rst
-%%WWWDIR%%/docs/source/02_install/installnginx.rst
+%%WWWDIR%%/docs/source/02_install/nginx-installation.rst
 %%WWWDIR%%/docs/source/02_install/overview.rst
 %%WWWDIR%%/docs/source/02_install/requirements.rst
 %%WWWDIR%%/docs/source/02_install/test.rst
@@ -146,13 +151,12 @@
 %%WWWDIR%%/docs/source/_static/bacula-web-user-settings.jpg
 %%WWWDIR%%/docs/source/_static/bacula-web-users.jpg
 %%WWWDIR%%/docs/source/_static/bacula-web-volumes.jpg
-%%WWWDIR%%/docs/source/_static/js/custom.js
 %%WWWDIR%%/docs/source/conf.py
 %%WWWDIR%%/docs/source/index.rst
 %%WWWDIR%%/index.php
-@owner www
-@group www
+%%WWWDIR%%/sonar-project.properties
 @dir(,,744) %%WWWDIR%%/application/assets/protected
 @dir(,,744) %%WWWDIR%%/application/views/cache
+@group www
+@owner www
 @sample %%WWWDIR%%/application/config/config.php.sample
-