diff --git a/dev-lang/php/patches/php8-8.4.14.patchset b/dev-lang/php/patches/php8-8.5.0.patchset
similarity index 93%
rename from dev-lang/php/patches/php8-8.4.14.patchset
rename to dev-lang/php/patches/php8-8.5.0.patchset
index 172d9ed27..59dcf1d91 100644
--- a/dev-lang/php/patches/php8-8.4.14.patchset
+++ b/dev-lang/php/patches/php8-8.5.0.patchset
@@ -1,4 +1,4 @@
-From b32597178779a485e24936d4738d07658785dfdb Mon Sep 17 00:00:00 2001
+From 19853c8dd683703b54564794f231d2675114c9c7 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
 Date: Sat, 19 Feb 2022 19:29:19 +0100
 Subject: Teaching m4 about Haiku
@@ -29,7 +29,7 @@ index 89efb26..7fe9847 100644
    AS_VAR_IF([BZIP_DIR],, [
      AC_MSG_RESULT([bzlib.h not found])
 diff --git a/ext/gettext/config.m4 b/ext/gettext/config.m4
-index ae3eaf3..c36e1ca 100644
+index 6235658..82c418a 100644
 --- a/ext/gettext/config.m4
 +++ b/ext/gettext/config.m4
 @@ -8,6 +8,14 @@ if test "$PHP_GETTEXT" != "no"; then
@@ -48,5 +48,5 @@ index ae3eaf3..c36e1ca 100644
      [AC_MSG_ERROR([Cannot locate header file libintl.h])])
  
 -- 
-2.45.2
+2.51.0
 
diff --git a/dev-lang/php/php8-8.4.14.recipe b/dev-lang/php/php8-8.5.0.recipe
similarity index 75%
rename from dev-lang/php/php8-8.4.14.recipe
rename to dev-lang/php/php8-8.5.0.recipe
index 1d3e8c882..b056b12d2 100644
--- a/dev-lang/php/php8-8.4.14.recipe
+++ b/dev-lang/php/php8-8.5.0.recipe
@@ -8,7 +8,7 @@ COPYRIGHT="2001-2024 PHP Group"
 LICENSE="PHP License v3.01"
 REVISION="1"
 SOURCE_URI="https://php.net/get/php-$portVersion.tar.bz2/from/this/mirror"
-CHECKSUM_SHA256="f2139ce4cb7a6c5643ee98caa34e5c32ba841c2ba293e34a3d0357faa84bb3e7"
+CHECKSUM_SHA256="cd16cb045b34a6cec6a83008e1b335f365c7a832fcc483df82308664c6d021f9"
 SOURCE_FILENAME="php-$portVersion.tar.bz2"
 SOURCE_DIR="php-$portVersion"
 PATCHES="php8-$portVersion.patchset"
@@ -30,17 +30,17 @@ fi
 
 PROVIDES="
 	php8$secondaryArchSuffix = $portVersion
-	cmd:pear
-	cmd:peardev
-	cmd:pecl
-	cmd:phar
-	cmd:phar.phar
-	cmd:php
-	cmd:phpdbg
-	cmd:php_cgi
-	cmd:php_config
-	cmd:phpize
-	cmd:php_fpm
+	cmd:pear$commandSuffix
+	cmd:peardev$commandSuffix
+	cmd:pecl$commandSuffix
+	cmd:phar$commandSuffix
+	cmd:phar.phar$commandSuffix
+	cmd:php$commandSuffix
+	cmd:phpdbg$commandSuffix
+	cmd:php_cgi$commandSuffix
+	cmd:php_config$commandSuffix
+	cmd:phpize$commandSuffix
+	cmd:php_fpm$commandSuffix
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -158,5 +158,21 @@ INSTALL()
 
 TEST()
 {
+# TEST RESULT SUMMARY
+# ---------------------------------------------------------------------
+# Exts skipped    :    25 (com_dotnet, dba, dl_test, enchant, ffi, gmp, iconv, ldap, odbc, pdo_dblib, pdo_firebird, pdo_mysql, pdo_odbc, pdo_pgsql, pgsql, shmop, skeleton, snmp, sodium, sysvmsg, sysvsem, sysvshm, tidy, xsl, zend_test)
+# Exts tested     :    46
+# ---------------------------------------------------------------------
+
+# Number of tests : 21442             18369
+# Tests borked    :     1 (  0.0%) --------
+# Tests skipped   :  3072 ( 14.3%) --------
+# Tests warned    :     1 (  0.0%) (  0.0%)
+# Tests failed    :   208 (  1.0%) (  1.1%)
+# Expected fail   :     9 (  0.0%) (  0.0%)
+# Tests passed    : 18151 ( 84.7%) ( 98.8%)
+# ---------------------------------------------------------------------
+# Time taken      : 1477.279 seconds
+
 	make test
 }