diff --git a/ChangeLog-8.php b/ChangeLog-8.php
index db7ffea8b..e05708a73 100644
--- a/ChangeLog-8.php
+++ b/ChangeLog-8.php
@@ -707,6 +707,86 @@ changelog_header(8, $MINOR_VERSIONS);
 
 <a id="PHP_8_1"></a>
 
+<section class="version" id="8.1.18"><!-- {{{ 8.1.18 -->
+<h3>Version 8.1.18</h3>
+<b><?php release_date('13-Apr-2023'); ?></b>
+<ul><li>Core:
+<ul>
+  <li>Added optional support for max_execution_time in ZTS/Linux builds.</li>
+  <li>Fixed use-after-free in recursive AST evaluation.</li>
+  <li>Fixed bug <?php githubissuel('php/php-src', 8646); ?> (Memory leak PHP FPM 8.1).</li>
+  <li>Fixed bug <?php githubissuel('php/php-src', 10801); ?> (Named arguments in CTE functions cause a segfault).</li>
+  <li>Fixed bug <?php githubissuel('php/php-src', 8789); ?> (PHP 8.0.20 (ZTS) zend_signal_handler_defer crashes on apache).</li>
+  <li>Fixed bug <?php githubissuel('php/php-src', 10015); ?> (zend_signal_handler_defer crashes on apache shutdown).</li>
+  <li>Fixed bug <?php githubissuel('php/php-src', 10810); ?> (Fix NUL byte terminating Exception::__toString()).</li>
+  <li>Fix potential memory corruption when mixing __callStatic() and FFI.</li>
+</ul></li>
+<li>Date:
+<ul>
+  <li>Fixed bug <?php githubissuel('php/php-src', 10583); ?> (DateTime modify with tz pattern should not update linked timezone).</li>
+</ul></li>
+<li>FPM:
+<ul>
+  <li>Fixed bug <?php githubissuel('php/php-src', 10611); ?> (fpm_env_init_main leaks environ).</li>
+  <li>Destroy file_handle in fpm_main.</li>
+  <li><?php bugfix(74129); ?> (Incorrect SCRIPT_NAME with apache ProxyPassMatch when spaces are in path).</li>
+</ul></li>
+<li>FTP:
+<ul>
+  <li>Propagate success status of ftp_close().</li>
+  <li>Fixed bug <?php githubissuel('php/php-src', 10521); ?> (ftp_get/ftp_nb_get resumepos offset is maximum 10GB).</li>
+</ul></li>
+<li>IMAP:
+<ul>
+  <li>Fix build failure with Clang 16.</li>
+</ul></li>
+<li>MySQLnd:
+<ul>
+  <li>Fixed bug <?php githubissuel('php/php-src', 8979); ?> (Possible Memory Leak with SSL-enabled MySQL connections).</li>
+</ul></li>
+<li>Opcache:
+<ul>
+  <li>Fixed build for macOS to cater with pkg-config settings.</li>
+  <li>Fixed bug <?php githubissuel('php/php-src', 8065); ?> (opcache.consistency_checks &gt; 0 causes segfaults in PHP &gt;= 8.1.5 in fpm context).</li>
+</ul></li>
+<li>OpenSSL:
+<ul>
+  <li>Add missing error checks on file writing functions.</li>
+</ul></li>
+<li>PDO Firebird:
+<ul>
+  <li>Fixed bug <?php githubissuel('php/php-src', 10908); ?> (Bus error with PDO Firebird on RPI with 64 bit kernel and 32 bit userland).</li>
+</ul></li>
+<li>PDO ODBC:
+<ul>
+  <li>Fixed missing and inconsistent error checks on SQLAllocHandle.</li>
+</ul></li>
+<li>Phar:
+<ul>
+  <li>Fixed bug <?php githubissuel('php/php-src', 10766); ?> (PharData archive created with Phar::Zip format does not keep files metadata (datetime)).</li>
+  <li>Add missing error checks on EVP_MD_CTX_create() and EVP_VerifyInit().</li>
+</ul></li>
+<li>PGSQL:
+<ul>
+  <li>Fixed typo in the array returned from pg_meta_data (extended mode).</li>
+</ul></li>
+<li>SPL:
+<ul>
+  <li>Fixed bug <?php githubissuel('php/php-src', 10519); ?> (Array Data Address Reference Issue).</li>
+  <li>Fixed bug <?php githubissuel('php/php-src', 10844); ?> (ArrayIterator allows modification of readonly props).</li>
+</ul></li>
+<li>Standard:
+<ul>
+  <li>Fixed bug <?php githubissuel('php/php-src', 10885); ?> (stream_socket_server context leaks).</li>
+  <li>Fixed bug <?php githubissuel('php/php-src', 10052); ?> (Browscap crashes PHP 8.1.12 on request shutdown (apache2)).</li>
+  <li>Fixed oss-fuzz #57392 (Buffer-overflow in php_fgetcsv() with \0 delimiter and enclosure).</li>
+  <li>Fixed undefined behaviour in unpack().</li>
+</ul></li>
+</ul>
+<!-- }}} --></section>
+
+
+
 <section class="version" id="8.1.17"><!-- {{{ 8.1.17 -->
 <h3>Version 8.1.17</h3>
 <b><?php release_date('16-Mar-2023'); ?></b>
diff --git a/archive/archive.xml b/archive/archive.xml
index 95c7650ce..fdd036ad5 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/2023-04-13-2.xml"/>
   <xi:include href="entries/2023-04-13-1.xml"/>
   <xi:include href="entries/2023-03-16-2.xml"/>
   <xi:include href="entries/2023-03-16-1.xml"/>
diff --git a/archive/entries/2023-04-13-2.xml b/archive/entries/2023-04-13-2.xml
new file mode 100644
index 000000000..bc58e5314
--- /dev/null
+++ b/archive/entries/2023-04-13-2.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<entry xmlns="http://www.w3.org/2005/Atom">
+  <title>PHP 8.1.18 Released!</title>
+  <id>https://www.php.net/archive/2023.php#2023-04-13-2</id>
+  <published>2023-04-13T23:59:59+00:00</published>
+  <updated>2023-04-13T23:59:59+00:00</updated>
+  <link href="https://www.php.net/index.php#2023-04-13-2" rel="alternate" type="text/html"/>
+  <link href="https://www.php.net/archive/2023.php#2023-04-13-2" 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.1.18. This is a bug fix release.</p>
+
+<p>All PHP 8.1 users are encouraged to upgrade to this version.</p>
+
+<p>For source downloads of PHP 8.1.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.1.18">ChangeLog</a>.
+</p>    </div>
+  </content>
+</entry>
diff --git a/include/releases.inc b/include/releases.inc
index e9839c380..22a0712fa 100644
--- a/include/releases.inc
+++ b/include/releases.inc
@@ -2,6 +2,42 @@
 $OLDRELEASES = array (
   8 => 
   array (
+    '8.1.17' => 
+    array (
+      'announcement' => 
+      array (
+        'English' => '/releases/8_1_17.php',
+      ),
+      'tags' => 
+      array (
+      ),
+      'date' => '16 Mar 2023',
+      'source' => 
+      array (
+        0 => 
+        array (
+          'filename' => 'php-8.1.17.tar.gz',
+          'name' => 'PHP 8.1.17 (tar.gz)',
+          'sha256' => 'ef270156291d90a80ce83d68eee812f301cf5e48836a0ff6fd2931913f8e25c5',
+          'date' => '16 Mar 2023',
+        ),
+        1 => 
+        array (
+          'filename' => 'php-8.1.17.tar.bz2',
+          'name' => 'PHP 8.1.17 (tar.bz2)',
+          'sha256' => 'f4fb298a0eb091f944ecebac57b76daae768a970c2f51610a5ab24f34d8c0caf',
+          'date' => '16 Mar 2023',
+        ),
+        2 => 
+        array (
+          'filename' => 'php-8.1.17.tar.xz',
+          'name' => 'PHP 8.1.17 (tar.xz)',
+          'sha256' => 'b5c48f95b8e1d8624dd05fc2eab7be13277f9a203ccba97bdca5a1a0fb4a1460',
+          'date' => '16 Mar 2023',
+        ),
+      ),
+      'museum' => false,
+    ),
     '8.2.4' => 
     array (
       'announcement' => 
diff --git a/include/version.inc b/include/version.inc
index 09394a3db..1cbd86a61 100644
--- a/include/version.inc
+++ b/include/version.inc
@@ -32,13 +32,13 @@ $RELEASES = (function () {
 
     /* PHP 8.1 Release */
     $data['8.1'] = [
-        'version' => '8.1.17',
-        'date' => '16 Mar 2023',
+        'version' => '8.1.18',
+        'date' => '13 Apr 2023',
         'tags' => [], // Set to ['security'] for security releases.
         'sha256' => [
-            'tar.gz' => 'ef270156291d90a80ce83d68eee812f301cf5e48836a0ff6fd2931913f8e25c5',
-            'tar.bz2' => 'f4fb298a0eb091f944ecebac57b76daae768a970c2f51610a5ab24f34d8c0caf',
-            'tar.xz' => 'b5c48f95b8e1d8624dd05fc2eab7be13277f9a203ccba97bdca5a1a0fb4a1460',
+            'tar.gz' => '8b6b12902e7d6bdf68668acc067b4d75a3c504722f768098c5f80c7d7bfd2563',
+            'tar.bz2' => 'd2ac30d6b574fca594fe0cc01c0693e23585b27443e342b0aab07274cde4416e',
+            'tar.xz' => 'f3553370f8ba42729a9ce75eed17a2111d32433a43b615694f6a571b8bad0e39',
         ]
     ];
 
diff --git a/releases/8_1_18.php b/releases/8_1_18.php
new file mode 100644
index 000000000..abf412d0f
--- /dev/null
+++ b/releases/8_1_18.php
@@ -0,0 +1,16 @@
+<?php
+$_SERVER['BASE_PAGE'] = 'releases/8_1_18.php';
+include_once __DIR__ . '/../include/prepend.inc';
+site_header('PHP 8.1.18 Release Announcement');
+?>
+<h1>PHP 8.1.18 Release Announcement</h1>
+
+<p>The PHP development team announces the immediate availability of PHP 8.1.18. This is a bug fix release.</p>
+
+<p>All PHP 8.1 users are encouraged to upgrade to this version.</p>
+
+<p>For source downloads of PHP 8.1.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.1.18">ChangeLog</a>.
+</p>
+<?php site_footer();