diff --git a/ChangeLog-8.php b/ChangeLog-8.php
index 74dd6fac5..b491040de 100644
--- a/ChangeLog-8.php
+++ b/ChangeLog-8.php
@@ -676,6 +676,62 @@ changelog_header(8, $MINOR_VERSIONS);
 
 <a id="PHP_8_0"></a>
 
+<section class="version" id="8.0.21"><!-- {{{ 8.0.21 -->
+<h3>Version 8.0.21</h3>
+<b><?php release_date('07-Jul-2022'); ?></b>
+<ul><li>Core:
+<ul>
+  <li>Fixed potential use after free in php_binary_init().</li>
+</ul></li>
+<li>CLI:
+<ul>
+  <li>Fixed <?php githubissuel('php/php-src',8827); ?> (Intentionally closing std handles no longer possible).</li>
+</ul></li>
+<li>COM:
+<ul>
+  <li>Fixed bug <?php githubissuel('php/php-src',8778); ?> (Integer arithmethic with large number variants fails).</li>
+</ul></li>
+<li>Curl:
+<ul>
+  <li>Fixed CURLOPT_TLSAUTH_TYPE is not treated as a string option.</li>
+</ul></li>
+<li>Date:
+<ul>
+  <li><?php bugfix(74671); ?> (DST timezone abbreviation has incorrect offset).</li>
+  <li><?php bugfix(77243); ?> (Weekdays are calculated incorrectly for negative years).</li>
+  <li><?php bugfix(78139); ?> (timezone_open accepts invalid timezone string argument).</li>
+</ul></li>
+<li>FPM:
+<ul>
+  <li><?php bugfix(67764); ?> (fpm: syslog.ident don't work).</li>
+</ul></li>
+<li>MBString:
+<ul>
+  <li>Fixed bug <?php githubissuel('php/php-src',8685); ?> (pcre not ready at mbstring startup).</li>
+</ul></li>
+<li>ODBC:
+<ul>
+  <li>Fixed handling of single-key connection strings.</li>
+</ul></li>
+<li>OpenSSL:
+<ul>
+  <li><?php bugfix(50293); ?> (Several openssl functions ignore the VCWD).</li>
+  <li><?php bugfix(81713); ?> (NULL byte injection in several OpenSSL functions working with certificates).</li>
+</ul></li>
+<li>PDO_ODBC:
+<ul>
+  <li>Fixed errorInfo() result on successful PDOStatement-&gt;execute().</li>
+  <li>Fixed handling of single-key connection strings.</li>
+</ul></li>
+<li>Zip:
+<ul>
+  <li>Fixed bug <?php githubissuel('php/php-src',8781); ?> (ZipArchive::close deletes zip file without updating stat cache).</li>
+</ul></li>
+</ul>
+<!-- }}} --></section>
+
+
+
 <section class="version" id="8.0.20"><!-- {{{ 8.0.20 -->
 <h3>Version 8.0.20</h3>
 <b><?php release_date('09-Jun-2022'); ?></b>
diff --git a/archive/archive.xml b/archive/archive.xml
index 82fe673aa..c9853dc6b 100644
--- a/archive/archive.xml
+++ b/archive/archive.xml
@@ -9,6 +9,7 @@
     <uri>http://php.net/contact</uri>
     <email>php-webmaster@lists.php.net</email>
   </author>
+  <xi:include href="entries/2022-07-07-1.xml"/>
   <xi:include href="entries/2022-07-06-1.xml"/>
   <xi:include href="entries/2022-07-01-1.xml"/>
   <xi:include href="entries/2022-06-30-1.xml"/>
diff --git a/archive/entries/2022-07-07-1.xml b/archive/entries/2022-07-07-1.xml
new file mode 100644
index 000000000..3210671b7
--- /dev/null
+++ b/archive/entries/2022-07-07-1.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<entry xmlns="http://www.w3.org/2005/Atom">
+  <title>PHP 8.0.21 Released!</title>
+  <id>https://www.php.net/archive/2022.php#2022-07-07-1</id>
+  <published>2022-07-07T09:31:10+00:00</published>
+  <updated>2022-07-07T09:31:10+00:00</updated>
+  <link href="https://www.php.net/index.php#2022-07-07-1" rel="alternate" type="text/html"/>
+  <link href="https://www.php.net/archive/2022.php#2022-07-07-1" rel="via" type="text/html"/>
+  <category term="releases" label="New PHP release"/>
+  <category term="frontpage" label="PHP.net frontpage news"/>
+  <content type="xhtml">
+    <div xmlns="http://www.w3.org/1999/xhtml"><p>The PHP development team announces the immediate availability of PHP 8.0.21. This is a bug fix release.</p>
+
+<p>All PHP 8.0 users are encouraged to upgrade to this version.</p>
+
+<p>For source downloads of PHP 8.0.21 please visit our <a href="https://www.php.net/downloads.php">downloads page</a>,
+Windows source and binaries can be found on <a href="https://windows.php.net/download/">windows.php.net/download/</a>.
+The list of changes is recorded in the <a href="https://www.php.net/ChangeLog-8.php#8.0.21">ChangeLog</a>.
+</p>    </div>
+  </content>
+</entry>
diff --git a/include/releases.inc b/include/releases.inc
index 1148c6037..86ee5846c 100644
--- a/include/releases.inc
+++ b/include/releases.inc
@@ -2,6 +2,43 @@
 $OLDRELEASES = array (
   8 => 
   array (
+    '8.0.20' => 
+    array (
+      'announcement' => 
+      array (
+        'English' => '/releases/8_0_20.php',
+      ),
+      'tags' => 
+      array (
+        0 => 'security',
+      ),
+      'date' => '09 Jun 2022',
+      'source' => 
+      array (
+        0 => 
+        array (
+          'filename' => 'php-8.0.20.tar.gz',
+          'name' => 'PHP 8.0.20 (tar.gz)',
+          'sha256' => '7e21fd985966264194cde63503b57fd0f0170b32a39bd7af2384c1071b50f164',
+          'date' => '09 Jun 2022',
+        ),
+        1 => 
+        array (
+          'filename' => 'php-8.0.20.tar.bz2',
+          'name' => 'PHP 8.0.20 (tar.bz2)',
+          'sha256' => 'cb7666bf67ed9f6c987d4836caf03d4b364537e6a75e56cd5c986760ecc2fdd8',
+          'date' => '09 Jun 2022',
+        ),
+        2 => 
+        array (
+          'filename' => 'php-8.0.20.tar.xz',
+          'name' => 'PHP 8.0.20 (tar.xz)',
+          'sha256' => '973fec765336ee01f47536a5db1c2eee98df9d34a41522b7b6c760159bf0a77b',
+          'date' => '09 Jun 2022',
+        ),
+      ),
+      'museum' => false,
+    ),
     '8.0.19' => 
     array (
       'announcement' => 
diff --git a/include/version.inc b/include/version.inc
index 49fb1adbd..35bd1260e 100644
--- a/include/version.inc
+++ b/include/version.inc
@@ -32,13 +32,13 @@ $RELEASES = (function() {
 
     /* PHP 8.0 Release */
     $data['8.0'] = [
-        'version' => '8.0.20',
-        'date'    => '09 Jun 2022',
-        'tags'    => ['security'], // Set to ['security'] for security releases.
+        'version' => '8.0.21',
+        'date'    => '07 Jul 2022',
+        'tags'    => [], // Set to ['security'] for security releases.
         'sha256' => [
-            'tar.gz'  => '7e21fd985966264194cde63503b57fd0f0170b32a39bd7af2384c1071b50f164',
-            'tar.bz2' => 'cb7666bf67ed9f6c987d4836caf03d4b364537e6a75e56cd5c986760ecc2fdd8',
-            'tar.xz'  => '973fec765336ee01f47536a5db1c2eee98df9d34a41522b7b6c760159bf0a77b',
+            'tar.gz'  => '2f51f6e90e2e8efd3a20db08f0dd61d7f8d5a9362f8c7325f1ad28ccea5be0ac',
+            'tar.bz2' => '1cb7762d1ffecceaeebafb9f6e24132ca23fb1443cb5630d0fccf53f04cfa126',
+            'tar.xz'  => 'e87a598f157e0cf0606e64382bb91c8b30c47d4a0fc96b2c17ad547a27869b3b',
         ]
     ];
 
diff --git a/releases/8_0_21.php b/releases/8_0_21.php
new file mode 100644
index 000000000..a05a0774f
--- /dev/null
+++ b/releases/8_0_21.php
@@ -0,0 +1,16 @@
+<?php
+$_SERVER['BASE_PAGE'] = 'releases/8_0_21.php';
+include_once __DIR__ . '/../include/prepend.inc';
+site_header('PHP 8.0.21 Release Announcement');
+?>
+<h1>PHP 8.0.21 Release Announcement</h1>
+
+<p>The PHP development team announces the immediate availability of PHP 8.0.21. This is a bug fix release.</p>
+
+<p>All PHP 8.0 users are encouraged to upgrade to this version.</p>
+
+<p>For source downloads of PHP 8.0.21 please visit our <a href="https://www.php.net/downloads.php">downloads page</a>,
+Windows source and binaries can be found on <a href="https://windows.php.net/download/">windows.php.net/download/</a>.
+The list of changes is recorded in the <a href="https://www.php.net/ChangeLog-8.php#8.0.21">ChangeLog</a>.
+</p>
+<?php site_footer();