diff --git a/ChangeLog-8.php b/ChangeLog-8.php
index 2406588e9..52f7f6cc6 100644
--- a/ChangeLog-8.php
+++ b/ChangeLog-8.php
@@ -548,6 +548,57 @@ changelog_header(8, $MINOR_VERSIONS);
 
 <a id="PHP_8_0"></a>
 
+<section class="version" id="8.0.18"><!-- {{{ 8.0.18 -->
+<h3>Version 8.0.18</h3>
+<b><?php release_date('14-Apr-2022'); ?></b>
+<ul><li>Core:
+<ul>
+  <li>Fixed freeing of internal attribute arguments.</li>
+  <li>Fixed bug <?php githubissuel('php/php-src',8070); ?> (memory leak of internal function attribute hash).</li>
+  <li>Fixed bug <?php githubissuel('php/php-src',8160); ?> (ZTS support on Alpine is broken).</li>
+</ul></li>
+<li>Filter:
+<ul>
+  <li>Fixed signedness confusion in php_filter_validate_domain().</li>
+</ul></li>
+<li>Intl:
+<ul>
+  <li>Fixed bug <?php githubissuel('php/php-src',8142); ?> (Compilation error on cygwin).</li>
+</ul></li>
+<li>MBString:
+<ul>
+  <li>Fixed bug <?php githubissuel('php/php-src',8208); ?> (mb_encode_mimeheader: $indent functionality broken).</li>
+</ul></li>
+<li>MySQLi:
+<ul>
+  <li>Fixed bug <?php githubissuel('php/php-src',8068); ?> (mysqli_fetch_object creates inaccessible properties).</li>
+</ul></li>
+<li>Pcntl:
+<ul>
+  <li>Fixed bug <?php githubissuel('php/php-src',8142); ?> (Compilation error on cygwin).</li>
+</ul></li>
+<li>PgSQL:
+<ul>
+  <li>Fixed result_type related stack corruption on LLP64 architectures.</li>
+  <li>Fixed bug <?php githubissuel('php/php-src',8253); ?> (pg_insert() fails for references).</li>
+</ul></li>
+<li>Sockets:
+<ul>
+  <li>Fixed Solaris builds.</li>
+</ul></li>
+<li>SPL:
+<ul>
+  <li>Fixed bug <?php githubissuel('php/php-src',8121); ?> (SplFileObject - seek and key with csv file inconsistent).</li>
+</ul></li>
+<li>Standard:
+<ul>
+  <li>Fixed bug <?php githubissuel('php/php-src',8048); ?> (Force macOS to use statfs).</li>
+</ul></li>
+</ul>
+<!-- }}} --></section>
+
+
+
 <section class="version" id="8.0.17"><!-- {{{ 8.0.17 -->
 <h3>Version 8.0.17</h3>
 <b><?php release_date('17-Mar-2022'); ?></b>
diff --git a/archive/archive.xml b/archive/archive.xml
index 7d7b7bad6..70078f87b 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-04-15-1.xml"/>
   <xi:include href="entries/2022-04-14-2.xml"/>
   <xi:include href="entries/2022-04-14-1.xml"/>
   <xi:include href="entries/2022-03-17-2.xml"/>
diff --git a/archive/entries/2022-04-15-1.xml b/archive/entries/2022-04-15-1.xml
new file mode 100644
index 000000000..108b42659
--- /dev/null
+++ b/archive/entries/2022-04-15-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.18 Released!</title>
+  <id>https://www.php.net/archive/2022.php#2022-04-15-1</id>
+  <published>2022-04-15T01:50:44+00:00</published>
+  <updated>2022-04-15T01:50:44+00:00</updated>
+  <link href="https://www.php.net/index.php#id2022-04-15-1" rel="alternate" type="text/html"/>
+  <link href="https://www.php.net/archive/2022.php#2022-04-15-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.18. 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.18 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.18">ChangeLog</a>.
+</p>    </div>
+  </content>
+</entry>
diff --git a/include/releases.inc b/include/releases.inc
index 8e7f0fa85..693235fc9 100644
--- a/include/releases.inc
+++ b/include/releases.inc
@@ -2,6 +2,42 @@
 $OLDRELEASES = array (
   8 => 
   array (
+    '8.0.17' => 
+    array (
+      'announcement' => 
+      array (
+        'English' => '/releases/8_0_17.php',
+      ),
+      'tags' => 
+      array (
+      ),
+      'date' => '17 Mar 2022',
+      'source' => 
+      array (
+        0 => 
+        array (
+          'filename' => 'php-8.0.17.tar.gz',
+          'name' => 'PHP 8.0.17 (tar.gz)',
+          'sha256' => 'bdbd792901c156c4d1710c9d266732d3c17f6ff63850d6660b9d8d3411188424',
+          'date' => '17 Mar 2022',
+        ),
+        1 => 
+        array (
+          'filename' => 'php-8.0.17.tar.bz2',
+          'name' => 'PHP 8.0.17 (tar.bz2)',
+          'sha256' => '52811ee2dde71660ca32737a4ac696c24591eb22e846dd8e09ee77122660283f',
+          'date' => '17 Mar 2022',
+        ),
+        2 => 
+        array (
+          'filename' => 'php-8.0.17.tar.xz',
+          'name' => 'PHP 8.0.17 (tar.xz)',
+          'sha256' => '4e7d94bb3d144412cb8b2adeb599fb1c6c1d7b357b0d0d0478dc5ef53532ebc5',
+          'date' => '17 Mar 2022',
+        ),
+      ),
+      'museum' => false,
+    ),
     '8.1.4' => 
     array (
       'announcement' => 
diff --git a/include/version.inc b/include/version.inc
index 8f6f8c5f2..a67971e62 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.17',
-        'date'    => '17 Mar 2022',
+        'version' => '8.0.18',
+        'date'    => '14 Apr 2022',
         'tags'    => [], // Set to ['security'] for security releases.
         'sha256' => [
-            'tar.gz'  => 'bdbd792901c156c4d1710c9d266732d3c17f6ff63850d6660b9d8d3411188424',
-            'tar.bz2' => '52811ee2dde71660ca32737a4ac696c24591eb22e846dd8e09ee77122660283f',
-            'tar.xz'  => '4e7d94bb3d144412cb8b2adeb599fb1c6c1d7b357b0d0d0478dc5ef53532ebc5',
+            'tar.gz'  => 'cd980f5a2f422362f8c52d314ed25140c6f472877c5442c4f3304205f54e192a',
+            'tar.bz2' => '826ee34881a1c349678d4f7cc55ff9141fa1411344e4bb8f95d0f9223bceb55a',
+            'tar.xz'  => 'db161652cacae4b31c347fbf2e17b80656473cb365f2bb3460c4552f5647e2e7',
         ]
     ];
 
diff --git a/releases/8_0_18.php b/releases/8_0_18.php
new file mode 100644
index 000000000..c7ef94398
--- /dev/null
+++ b/releases/8_0_18.php
@@ -0,0 +1,16 @@
+<?php
+$_SERVER['BASE_PAGE'] = 'releases/8_0_18.php';
+include_once __DIR__ . '/../include/prepend.inc';
+site_header('PHP 8.0.18 Release Announcement');
+?>
+<h1>PHP 8.0.18 Release Announcement</h1>
+
+<p>The PHP development team announces the immediate availability of PHP 8.0.18. 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.18 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.18">ChangeLog</a>.
+</p>
+<?php site_footer();