diff --git a/appendices/extensions.xml b/appendices/extensions.xml
index 4e9332736e4b..0a48632beb45 100644
--- a/appendices/extensions.xml
+++ b/appendices/extensions.xml
@@ -277,22 +277,18 @@
     <listitem><para><xref linkend="book.enchant"/></para></listitem>
     <listitem><para><xref linkend="book.gettext"/></para></listitem>
     <listitem><para><xref linkend="book.gmp"/></para></listitem>
-    <listitem><para><xref linkend="book.imap"/></para></listitem>
     <listitem><para><xref linkend="book.ldap"/></para></listitem>
     <listitem><para><xref linkend="book.libxml"/></para></listitem>
     <listitem><para><xref linkend="book.mysqli"/></para></listitem>
     <listitem><para><xref linkend="book.mysqlnd"/></para></listitem>
-    <listitem><para><xref linkend="book.oci8"/></para></listitem>
     <listitem><para><xref linkend="book.openssl"/></para></listitem>
     <listitem><para><xref linkend="ref.pdo-dblib"/></para></listitem>
     <listitem><para><xref linkend="ref.pdo-firebird"/></para></listitem>
     <listitem><para><xref linkend="ref.pdo-mysql"/></para></listitem>
-    <listitem><para><xref linkend="ref.pdo-oci"/></para></listitem>
     <listitem><para><xref linkend="ref.pdo-odbc"/></para></listitem>
     <listitem><para><xref linkend="ref.pdo-pgsql"/></para></listitem>
     <listitem><para><xref linkend="ref.pdo-sqlite"/></para></listitem>
     <listitem><para><xref linkend="book.pgsql"/></para></listitem>
-    <listitem><para><xref linkend="book.pspell"/></para></listitem>
     <listitem><para><xref linkend="book.readline"/></para></listitem>
     <listitem><para><xref linkend="book.simplexml"/></para></listitem>
     <listitem><para><xref linkend="book.snmp"/></para></listitem>
@@ -335,6 +331,7 @@
     <listitem><para><xref linkend="book.ibm-db2"/></para></listitem>
     <listitem><para><xref linkend="book.igbinary"/></para></listitem>
     <listitem><para><xref linkend="book.imagick"/></para></listitem>
+    <listitem><para><xref linkend="book.imap"/></para></listitem>
     <listitem><para><xref linkend="book.inotify"/></para></listitem>
     <listitem><para><xref linkend="book.lua"/></para></listitem>
     <listitem><para><xref linkend="book.luasandbox"/></para></listitem>
@@ -348,14 +345,17 @@
     <listitem><para><xref linkend="book.mysql"/></para></listitem>
     <listitem><para><xref linkend="book.mysql-xdevapi"/></para></listitem>
     <listitem><para><xref linkend="book.oauth"/></para></listitem>
+    <listitem><para><xref linkend="book.oci8"/></para></listitem>
     <listitem><para><xref linkend="book.openal"/></para></listitem>
     <listitem><para><xref linkend="book.parallel"/></para></listitem>
     <listitem><para><xref linkend="book.parle"/></para></listitem>
     <listitem><para><xref linkend="ref.pdo-cubrid"/></para></listitem>
     <listitem><para><xref linkend="ref.pdo-ibm"/></para></listitem>
     <listitem><para><xref linkend="ref.pdo-informix"/></para></listitem>
+    <listitem><para><xref linkend="ref.pdo-oci"/></para></listitem>
     <listitem><para><xref linkend="ref.pdo-sqlsrv"/></para></listitem>
     <listitem><para><xref linkend="book.ps"/></para></listitem>
+    <listitem><para><xref linkend="book.pspell"/></para></listitem>
     <listitem><para><xref linkend="book.pthreads"/></para></listitem>
     <listitem><para><xref linkend="book.quickhash"/></para></listitem>
     <listitem><para><xref linkend="book.radius"/></para></listitem>
@@ -415,6 +415,7 @@
    &extcat.state.deprecated;
 
    <itemizedlist>
+    <listitem><para><xref linkend="book.imap"/></para></listitem>
     <listitem><para><xref linkend="book.mysql"/></para></listitem>
     <listitem><para><xref linkend="book.wddx"/></para></listitem>
     <listitem><para><xref linkend="book.xmlrpc"/></para></listitem>
diff --git a/reference/imap/book.xml b/reference/imap/book.xml
index d7c74ae4e789..4e4df572bf1d 100644
--- a/reference/imap/book.xml
+++ b/reference/imap/book.xml
@@ -1,14 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
- 
+<!-- State: deprecated -->
 <book xml:id="book.imap" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <?phpdoc extension-membership="bundledexternal" ?>
+ <?phpdoc extension-membership="pecl" ?>
  <title>IMAP, POP3 and NNTP</title>
  <titleabbrev>IMAP</titleabbrev>
  
  <!-- {{{ preface -->
  <preface xml:id="intro.imap">
   &reftitle.intro;
+  <warning>
+   <simpara>
+    This extension is <emphasis>DEPRECATED</emphasis> and <emphasis>UNBUNDLED</emphasis> as of PHP 8.4.0.
+   </simpara>
+  </warning>
   <para>
    These functions enable you to operate with the <acronym>IMAP</acronym>
    protocol, as well as the <acronym>NNTP</acronym>, <acronym>POP3</acronym>
@@ -32,7 +36,6 @@
  &reference.imap.imap.connection;
 
 </book>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/imap/configure.xml b/reference/imap/configure.xml
index 32848a19f6fd..b3ee3dc1d94b 100644
--- a/reference/imap/configure.xml
+++ b/reference/imap/configure.xml
@@ -1,36 +1,49 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<section xml:id="imap.installation" xmlns="http://docbook.org/ns/docbook">
+<section xml:id="imap.installation" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  &reftitle.install;
- <para>
-  To get these functions to work, you have to compile PHP with
-  <option role="configure">--with-imap[=DIR]</option>, where DIR is the
-  c-client install prefix.  From our example above, you would use 
-  <option role="configure">--with-imap=/usr/local/imap-2000b</option>.
-  This location depends on where you created this directory according to the
-  description above. <productname>Windows</productname> users may include the 
-  <filename>php_imap.dll</filename> DLL in &php.ini;.
- </para>
- <note>
-  <simpara>
-   Depending on how the c-client was configured, you might also need
-   to add <option
-   role="configure">--with-imap-ssl=/path/to/openssl/</option> and/or
-   <option role="configure">--with-kerberos=/path/to/kerberos</option>
-   to the PHP configure line.
-  </simpara>
- </note>
+ <section xml:id="imap.installation.php84">
+  <title>PHP 8.4</title>
+  <para>
+   &pecl.moved-ver;8.4.0
+  </para>
+  <para>
+   &pecl.info;
+   <link xlink:href="&url.pecl.package;imap">&url.pecl.package;imap</link>.
+  </para>
+ </section>
 
- <warning>
-  <simpara>
-   The IMAP extension is not thread-safe; it should not be used with ZTS builds.
-  </simpara>
- </warning>
+ <section xml:id="imap.installation.phplt84">
+  <title>PHP &lt; 8.4</title>
+  <para>
+   To get these functions to work, you have to compile PHP with
+   <option role="configure">--with-imap[=DIR]</option>, where DIR is the
+   c-client install prefix.  From our example above, you would use
+   <option role="configure">--with-imap=/usr/local/imap-2000b</option>.
+   This location depends on where you created this directory according to the
+   description above. <productname>Windows</productname> users may include the
+   <filename>php_imap.dll</filename> DLL in &php.ini;.
+  </para>
+  <note>
+   <simpara>
+    Depending on how the c-client was configured, you might also need
+    to add <option
+    role="configure">--with-imap-ssl=/path/to/openssl/</option> and/or
+    <option role="configure">--with-kerberos=/path/to/kerberos</option>
+    to the PHP configure line.
+   </simpara>
+  </note>
 
- &warn.imaprecodeyaz;
+  <warning>
+   <simpara>
+    The IMAP extension is not thread-safe; it should not be used with ZTS builds.
+   </simpara>
+  </warning>
 
-</section>
+  &warn.imaprecodeyaz;
+ </section>
 
+</section>
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/oci8/book.xml b/reference/oci8/book.xml
index f2a7f002e44a..b4ecf58237c8 100644
--- a/reference/oci8/book.xml
+++ b/reference/oci8/book.xml
@@ -2,13 +2,18 @@
 <!-- $Revision$ -->
  
 <book xml:id="book.oci8" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <?phpdoc extension-membership="bundledexternal" ?>
+ <?phpdoc extension-membership="pecl" ?>
  <title>Oracle OCI8</title>
  <titleabbrev>OCI8</titleabbrev>
  
  <!-- {{{ preface -->
  <preface xml:id="intro.oci8">
   &reftitle.intro;
+  <warning>
+   <simpara>
+    This extension is <emphasis>UNBUNDLED</emphasis> as of PHP 8.4.0.
+   </simpara>
+  </warning>
   <para>
    These functions allow you to access Oracle Database. They support SQL and
    PL/SQL statements. Basic features include transaction control, binding of PHP
diff --git a/reference/pdo_oci/configure.xml b/reference/pdo_oci/configure.xml
index b0fb263c15a4..f4b832bfd0dd 100644
--- a/reference/pdo_oci/configure.xml
+++ b/reference/pdo_oci/configure.xml
@@ -9,30 +9,44 @@
   <link xlink:href="&url.oracle.instant.client;">Oracle Instant Client</link> libraries.
   For details refer to the <link linkend="oci8.requirements">OCI8 Requirements</link> section.
  </para>
- <para>
-  Use <option role="configure">--with-pdo-oci[=DIR]</option> to install
-  the PDO Oracle OCI extension, where the optional <literal>[=DIR]</literal>
-  is the Oracle Home directory. <literal>[=DIR]</literal> defaults to
-  the <varname>$ORACLE_HOME</varname> environment variable.
- </para>
- <para>
-  Use <option role="configure">--with-pdo-oci=instantclient,prefix,version</option>
-  for an Oracle Instant Client <acronym>SDK</acronym>, where prefix and
-  version are configured.
- </para>
- <para>
-  <screen>
-<![CDATA[
+
+ <section xml:id="pdo-oci.installation.php84">
+  <title>PHP 8.4</title>
+  <para>
+   &pecl.moved-ver;8.4.0
+  </para>
+  <para>
+   &pecl.info;
+   <link xlink:href="&url.pecl.package;PDO_OCI">&url.pecl.package;PDO_OCI</link>.
+  </para>
+ </section>
+
+ <section xml:id="pdo-oci.installation.phplt84">
+  <title>PHP &lt; 8.4</title>
+  <para>
+   Use <option role="configure">--with-pdo-oci[=DIR]</option> to install
+   the PDO Oracle OCI extension, where the optional <literal>[=DIR]</literal>
+   is the Oracle Home directory. <literal>[=DIR]</literal> defaults to
+   the <varname>$ORACLE_HOME</varname> environment variable.
+  </para>
+  <para>
+   Use <option role="configure">--with-pdo-oci=instantclient,prefix,version</option>
+   for an Oracle Instant Client <acronym>SDK</acronym>, where prefix and
+   version are configured.
+  </para>
+  <para>
+   <screen>
+    <![CDATA[
 // Using $ORACLE_HOME
 $ ./configure --with-pdo-oci
 
 // Using OIC for Linux with 10.2.0.3 RPMs with a /usr prefix
 $ ./configure --with-pdo-oci=instantclient,/usr,10.2.0.3
 ]]>
-  </screen>
- </para>
+   </screen>
+  </para>
+ </section>
 </section>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/pdo_oci/reference.xml b/reference/pdo_oci/reference.xml
index 4f65496c993a..28b7fe69fc20 100644
--- a/reference/pdo_oci/reference.xml
+++ b/reference/pdo_oci/reference.xml
@@ -2,7 +2,7 @@
 <!-- $Revision$ -->
 
  <reference xml:id="ref.pdo-oci" xmlns="http://docbook.org/ns/docbook">
-  <?phpdoc extension-membership="bundledexternal" ?>
+  <?phpdoc extension-membership="pecl" ?>
   <title>Oracle Functions (PDO_OCI)</title>
   <titleabbrev>Oracle (PDO)</titleabbrev>
   <partintro>
diff --git a/reference/pspell/book.xml b/reference/pspell/book.xml
index 910bb3f71715..7864ab05595f 100644
--- a/reference/pspell/book.xml
+++ b/reference/pspell/book.xml
@@ -1,20 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
- 
 <book xml:id="book.pspell" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <?phpdoc extension-membership="bundledexternal" ?>
+ <?phpdoc extension-membership="pecl" ?>
  <title>Pspell</title>
- 
+
  <!-- {{{ preface -->
  <preface xml:id="intro.pspell">
   &reftitle.intro;
+  <warning>
+   <simpara>
+    This extension is <emphasis>DEPRECATED</emphasis> and <emphasis>UNBUNDLED</emphasis> as of PHP 8.4.0.
+   </simpara>
+  </warning>
   <para>
    These functions allow you to check the spelling of a word and offer
    suggestions.
   </para>
  </preface>
  <!-- }}} -->
- 
+
  &reference.pspell.setup;
  &reference.pspell.constants;
  &reference.pspell.reference;
@@ -22,7 +26,6 @@
  &reference.pspell.pspell.config;
 
 </book>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/pspell/configure.xml b/reference/pspell/configure.xml
index 48ba52821fa7..1405fcb5e421 100644
--- a/reference/pspell/configure.xml
+++ b/reference/pspell/configure.xml
@@ -1,25 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<section xml:id="pspell.installation" xmlns="http://docbook.org/ns/docbook">
+<section xml:id="pspell.installation" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  &reftitle.install;
- <para>
-  If you have the libraries needed add the
-  <option role="configure">--with-pspell[=dir]</option> option
-  when compiling PHP.
- </para>
- <note>
-  <title>Note to Win32 Users</title>
+ <section xml:id="pspell.installation.php84">
+  <title>PHP 8.4</title>
   <para>
-   &ext.windows.path.dll;
-   <filename>aspell-15.dll</filename> from the 
-   <filename>bin</filename> folder of the aspell installation.
+   &pecl.moved-ver;8.4.0
   </para>
   <para>
-   Win32 support requires at least aspell version 0.50.
+   &pecl.info;
+   <link xlink:href="&url.pecl.package;pspell">&url.pecl.package;pspell</link>.
   </para>
- </note>
-</section>
+ </section>
 
+ <section xml:id="pspell.installation.phplt84">
+  <title>PHP &lt; 8.4</title>
+  <para>
+   To enable this extension compile PHP with the
+   <option role="configure">--with-pspell[=dir]</option> option.
+  </para>
+  <note>
+   <title>Note to Win32 Users</title>
+   <para>
+    &ext.windows.path.dll;
+    <filename>aspell-15.dll</filename> from the
+    <filename>bin</filename> folder of the aspell installation.
+   </para>
+   <para>
+    Win32 support requires at least aspell version 0.50.
+   </para>
+  </note>
+ </section>
+</section>
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml