diff --git a/srcpkgs/php8.0/patches/fix-manpages.patch b/srcpkgs/php8.0/patches/fix-manpages.patch
new file mode 100644
index 00000000000..d956c290465
--- /dev/null
+++ b/srcpkgs/php8.0/patches/fix-manpages.patch
@@ -0,0 +1,25 @@
+This patch fixes .so links in man pages.
+It's needed because of the configure option -
+
+    --program-suffix=${_php_version}
+
+The changes made by this patch should be the same as the changes made by this
+block of code -
+
+    _regexp='^[[:space:]]*\.so[[:space:]]'
+    for file in $(grep -l -e "$_regexp" -R .); do
+    	vsed -i "$file" -e "/$_regexp/"'s=^[[:space:]]*\.[^.]*=&'${_php_version}=
+    done
+
+Where _php_version is defined in the template file.
+
+--- a/ext/phar/phar.phar.1.in
++++ b/ext/phar/phar.phar.1.in
+@@ -1 +1 @@
+-.so man1/phar.1
++.so man1/phar8.0.1
+--- a/sapi/cgi/php-cgi.1.in
++++ b/sapi/cgi/php-cgi.1.in
+@@ -1 +1 @@
+-.so man1/php.1
++.so man1/php8.0.1
diff --git a/srcpkgs/php8.0/template b/srcpkgs/php8.0/template
index 7746ee52c73..48c8f2d386c 100644
--- a/srcpkgs/php8.0/template
+++ b/srcpkgs/php8.0/template
@@ -1,7 +1,7 @@
 # Template file for 'php8.0'
 pkgname=php8.0
-version=8.0.20
-revision=2
+version=8.0.21
+revision=1
 _php_version=8.0
 wrksrc="php-${version}"
 hostmakedepends="bison pkg-config apache-devel"
@@ -14,8 +14,9 @@ short_desc="HTML-embedded scripting language"
 maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="PHP-3.01"
 homepage="https://www.php.net"
+changelog="https://raw.githubusercontent.com/php/php-src/php-${version}/NEWS"
 distfiles="https://www.php.net/distributions/php-${version}.tar.gz"
-checksum=7e21fd985966264194cde63503b57fd0f0170b32a39bd7af2384c1071b50f164
+checksum=2f51f6e90e2e8efd3a20db08f0dd61d7f8d5a9362f8c7325f1ad28ccea5be0ac
 
 conf_files="/etc/php${_php_version}/php.ini"