diff --git a/lang/php80/Makefile b/lang/php80/Makefile
index 1e4c627208c8..00eb5388ba65 100644
--- a/lang/php80/Makefile
+++ b/lang/php80/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	php80
-DISTVERSION=	8.0.6
+DISTVERSION=	8.0.7
 PORTREVISION?=	0
 CATEGORIES?=	lang devel www
 MASTER_SITES=	PHP/distributions
diff --git a/lang/php80/distinfo b/lang/php80/distinfo
index 88282d6fad96..8bb933dde6b4 100644
--- a/lang/php80/distinfo
+++ b/lang/php80/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1620427272
-SHA256 (php-8.0.6.tar.xz) = e9871d3b6c391fe9e89f86f6334852dcc10eeaaa8d5565beb8436e7f0cf30e20
-SIZE (php-8.0.6.tar.xz) = 10764932
+TIMESTAMP = 1622805963
+SHA256 (php-8.0.7.tar.xz) = d5fc2e4fc780a32404d88c360e3e0009bc725d936459668e9c2ac992f2d83654
+SIZE (php-8.0.7.tar.xz) = 10769208
diff --git a/www/php80-opcache/files/patch-config.m4 b/www/php80-opcache/files/patch-config.m4
index fed4878a849e..5085bbe0eaf5 100644
--- a/www/php80-opcache/files/patch-config.m4
+++ b/www/php80-opcache/files/patch-config.m4
@@ -1,11 +1,11 @@
---- config.m4.orig	2020-11-24 17:04:03 UTC
+--- config.m4.orig	2021-06-01 18:43:05 UTC
 +++ config.m4
 @@ -29,7 +29,7 @@ if test "$PHP_OPCACHE" != "no"; then
  
    if test "$PHP_OPCACHE_JIT" = "yes"; then
      case $host_cpu in
--      x86*)
-+      x86*|amd64|i386)
+-      i[[34567]]86*|x86*)
++      i[[34567]]86*|x86*|amd64)
          ;;
        *)
          AC_MSG_WARN([JIT not supported by host architecture])