diff --git a/.gitignore b/.gitignore
index 0b59003..8666ef4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,5 @@ php-8.1.*.xz.asc
 /php-8.0.18.tar.xz.asc
 /php-8.0.19.tar.xz
 /php-8.0.19.tar.xz.asc
+/php-8.0.20.tar.xz
+/php-8.0.20.tar.xz.asc
diff --git a/php-mbstring.patch b/php-mbstring.patch
new file mode 100644
index 0000000..7da512b
--- /dev/null
+++ b/php-mbstring.patch
@@ -0,0 +1,33 @@
+From 2eb2f9d74f22bf35a4915ec95afc53a47ebf1af9 Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Thu, 2 Jun 2022 08:05:22 +0200
+Subject: [PATCH] Fix GH-8685 mbstring requires pcre
+
+---
+ ext/mbstring/mbstring.c | 11 ++++++++++-
+ 1 file changed, 10 insertions(+), 1 deletion(-)
+
+diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
+index 48f22a682a19..4a4088aed3fb 100644
+--- a/ext/mbstring/mbstring.c
++++ b/ext/mbstring/mbstring.c
+@@ -161,9 +161,18 @@ static const php_mb_nls_ident_list php_mb_default_identify_list[] = {
+ 
+ /* }}} */
+ 
++/* {{{ mbstring_deps[] */
++static const zend_module_dep mbstring_deps[] = {
++	ZEND_MOD_REQUIRED("pcre")
++	ZEND_MOD_END
++};
++/* }}} */
++
+ /* {{{ zend_module_entry mbstring_module_entry */
+ zend_module_entry mbstring_module_entry = {
+-	STANDARD_MODULE_HEADER,
++	STANDARD_MODULE_HEADER_EX,
++	NULL,
++	mbstring_deps,
+ 	"mbstring",
+ 	ext_functions,
+ 	PHP_MINIT(mbstring),
diff --git a/php.spec b/php.spec
index a0d00f5..2b232fd 100644
--- a/php.spec
+++ b/php.spec
@@ -64,7 +64,7 @@
 %bcond_with      imap
 %bcond_without   lmdb
 
-%global upver        8.0.19
+%global upver        8.0.20
 #global rcver        RC1
 
 Summary: PHP scripting language for creating dynamic web sites
@@ -129,6 +129,7 @@ Patch49: php-8.0.10-phar-sha.patch
 Patch51: php-8.0.13-crypt.patch
 
 # Upstream fixes (100+)
+Patch100: php-mbstring.patch
 
 # Security fixes (200+)
 
@@ -732,6 +733,7 @@ in pure PHP.
 %patch51 -p1 -b .libxcrypt
 
 # upstream patches
+%patch100 -p1 -b .up
 
 # security patches
 
@@ -1548,6 +1550,10 @@ systemctl try-restart php-fpm.service >/dev/null 2>&1 || :
 
 
 %changelog
+* Wed Jun  8 2022 Remi Collet <remi@remirepo.net> - 8.0.20-1
+- Update to 8.0.20 - http://www.php.net/releases/8_0_20.php
+- add upstream patch to initialize pcre before mbstring
+
 * Tue May 10 2022 Remi Collet <remi@remirepo.net> - 8.0.19-1
 - Update to 8.0.19 - http://www.php.net/releases/8_0_19.php
 
diff --git a/sources b/sources
index e42f322..a687f05 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (php-8.0.19.tar.xz) = 106aa7c9f4804b8ce3518d7e6da4dc8f2a4df2f0b5d7369776737e0b13d4cd6be375694b78271fd1d007d4e0892009dc2a7214c1652462ebf128b74f845787e8
-SHA512 (php-8.0.19.tar.xz.asc) = bd74fcdd2d5477c22d0ff0ddf00e0df2ba0e0f05e4dbdbd42d1a6d74858e8c5a19bfd396380ace767a478801d71838537b700e7d7e0e164fbddff78d12633ebc
+SHA512 (php-8.0.20.tar.xz) = 24153733111bb5104298679fb5ee02d8abad4e6b2a8e0a07c2a6076e1c9104309abe56bcb7b5fe17670c266e5e9981c520ed0ac12b699ae0050953ff99ef04fa
+SHA512 (php-8.0.20.tar.xz.asc) = 59cb79f14b36c4aa0b18caff0f7028bb2fb88c07bc188534b78124ef6a73c941bce651ae52a58571159ad406b961c45049503c0cb378a9eadd168250fb7dbc04