diff --git a/appendices/extensions.xml b/appendices/extensions.xml
index d5679c93f3e6..efc5a9ee790e 100644
--- a/appendices/extensions.xml
+++ b/appendices/extensions.xml
@@ -414,6 +414,8 @@
 
    <itemizedlist>
     <listitem><para><xref linkend="book.mysql"/></para></listitem>
+    <listitem><para><xref linkend="book.recode"/></para></listitem>
+    <listitem><para><xref linkend="book.stats"/></para></listitem>
     <listitem><para><xref linkend="book.wddx"/></para></listitem>
     <listitem><para><xref linkend="book.xmlrpc"/></para></listitem>
    </itemizedlist>
@@ -423,7 +425,15 @@
    &extcat.state.experimental;
 
    <itemizedlist>
+    <listitem><para><xref linkend="book.gmagick"/></para></listitem>
     <listitem><para><xref linkend="book.imagick"/></para></listitem>
+    <listitem><para><xref linkend="book.mqseries"/></para></listitem>
+    <listitem><para><xref linkend="book.parle"/></para></listitem>
+    <listitem><para><xref linkend="book.rnp"/></para></listitem>
+    <listitem><para><xref linkend="book.svm"/></para></listitem>
+    <listitem><para><xref linkend="book.svn"/></para></listitem>
+    <listitem><para><xref linkend="book.ui"/></para></listitem>
+    <listitem><para><xref linkend="book.zmq"/></para></listitem>
    </itemizedlist>
   </section>
  </section>
diff --git a/language-snippets.ent b/language-snippets.ent
index a2d668ca06a0..db69fc5fc545 100644
--- a/language-snippets.ent
+++ b/language-snippets.ent
@@ -2053,6 +2053,10 @@ for this <acronym xmlns="http://docbook.org/ns/docbook">PECL</acronym> extension
 <!ENTITY pecl.moved-ver 'This extension has been moved to the &link.pecl;
 repository and is no longer bundled with PHP as of PHP '>
 
+<!ENTITY warn.pecl.unmaintained '<warning xmlns="http://docbook.org/ns/docbook">
+ <simpara>This extension is <emphasis>unmaintained</emphasis>.</simpara>
+</warning>'>
+
 <!-- PGSQL entities -->
 
 <!ENTITY pgsql.parameter.connection '<para xmlns="http://docbook.org/ns/docbook">An <classname>PgSql\Connection</classname> instance.</para>'>
diff --git a/reference/gmagick/book.xml b/reference/gmagick/book.xml
index 6865a3839583..fc2e67bd9617 100644
--- a/reference/gmagick/book.xml
+++ b/reference/gmagick/book.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
+<!-- State: experimental -->
 
 <book xml:id="book.gmagick" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <?phpdoc extension-membership="pecl" ?>
@@ -9,6 +10,7 @@
  <preface xml:id="intro.gmagick">
   &reftitle.intro;
   <para>
+   &warn.experimental;
    Gmagick is a php extension to create, modify and obtain meta information of images using the GraphicsMagick API. 
   </para>
   <para>
diff --git a/reference/imagick/book.xml b/reference/imagick/book.xml
index 02780dd72379..1158a27e79b7 100644
--- a/reference/imagick/book.xml
+++ b/reference/imagick/book.xml
@@ -11,6 +11,7 @@
  <preface xml:id="intro.imagick">
   &reftitle.intro;
   <para>
+   &warn.experimental;
    Imagick is a native php extension to create and modify images using the
    ImageMagick API.
   </para>
diff --git a/reference/mqseries/book.xml b/reference/mqseries/book.xml
index 21f2e576eb33..affe8dc864d3 100644
--- a/reference/mqseries/book.xml
+++ b/reference/mqseries/book.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
+<!-- State: experimental -->
 
 <book xml:id="book.mqseries" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <?phpdoc extension-membership="pecl" ?>
@@ -8,10 +9,11 @@
  <!-- {{{ preface -->
  <preface xml:id="intro.mqseries">
   &reftitle.intro;
-  <simpara>
+  <para>
+   &warn.experimental;
    This extension aims to provide an interface for communicating with IBMs
    WebSphere MQ series Queue managers.
-  </simpara>
+  </para>
   <simpara>
    The interface mimics the C-API client interface of WebSphere MQ Series as
    close as possible. Using the same naming conventions and possibilities of the
diff --git a/reference/parle/book.xml b/reference/parle/book.xml
index 22253860e488..909851d31418 100644
--- a/reference/parle/book.xml
+++ b/reference/parle/book.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
+<!-- State: experimental -->
 
 <book xml:id="book.parle" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <?phpdoc extension-membership="pecl" ?>
@@ -9,6 +10,7 @@
  <preface xml:id="intro.parle">
   &reftitle.intro;
   <para>
+   &warn.experimental;
    The parle extension provides general purpose lexing and parsing facilities. The implementation is based on <link xlink:href="http://www.benhanson.net/">Ben Hanson</link>'s libraries and requires a <link xlink:href="http://en.cppreference.com/w/cpp/compiler_support">C++14</link> capable compiler. The lexer is based on the regex matching, the parser is LALR(1). Lexers and parsers are generated on the fly and can be used immediately after they've been finalized. Parle deals with parsing and lexing, the appropriate data structures representation and processing are the implementer's task. Serialization and code generation are not supported by the extension, yet.
   </para>
   <para>
diff --git a/reference/recode/book.xml b/reference/recode/book.xml
index bbef7ab1a2e9..11d0f654c5e4 100644
--- a/reference/recode/book.xml
+++ b/reference/recode/book.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
+<!-- State: deprecated -->
 
 <book xml:id="book.recode" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <?phpdoc extension-membership="pecl" ?>
@@ -10,6 +11,7 @@
  <preface xml:id="intro.recode">
   &reftitle.intro;
   <para>
+   &warn.pecl.unmaintained;
    This module contains an interface to the GNU Recode library. The GNU
    Recode library converts files between various coded character sets and
    surface encodings. When this cannot be achieved exactly, it may get rid
diff --git a/reference/rnp/book.xml b/reference/rnp/book.xml
index a169d8ebf667..2bd3bf187472 100644
--- a/reference/rnp/book.xml
+++ b/reference/rnp/book.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- State: experimental -->
 <book xml:id="book.rnp" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <?phpdoc extension-membership="pecl" ?>
  <title>Rnp</title>
@@ -7,6 +8,7 @@
  <preface xml:id="intro.rnp">
   &reftitle.intro;
   <para>
+   &warn.experimental;
    This module allows you to use <link
    xlink:href="&url.rnp;">RNP</link> library.
    RNP is a high performance C++ OpenPGP
diff --git a/reference/stats/book.xml b/reference/stats/book.xml
index 6b63c747dbd4..f22c762ac6eb 100644
--- a/reference/stats/book.xml
+++ b/reference/stats/book.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
+<!-- State: deprecated -->
 
 <book xml:id="book.stats" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <?phpdoc extension-membership="pecl" ?>
@@ -9,6 +10,7 @@
  <preface xml:id="intro.stats">
   &reftitle.intro;
   <para>
+   &warn.pecl.unmaintained;
    This is the statistics extension. It contains few dozens of functions
    useful for statistical computations. It is a wrapper around 2 scientific
    libraries, namely DCDFLIB (Library of C routines for Cumulative
diff --git a/reference/stats/setup.xml b/reference/stats/setup.xml
index 0453966b89c1..38de124f586e 100644
--- a/reference/stats/setup.xml
+++ b/reference/stats/setup.xml
@@ -20,7 +20,7 @@
     &pecl.moved;
    </para>
    <para>
-    &pecl.info;
+    &pecl.info.dead;
     <link xlink:href="&url.pecl.package;stats">&url.pecl.package;stats</link>.
    </para>
    <para>
diff --git a/reference/svm/book.xml b/reference/svm/book.xml
index 2b0949168fc3..e1ee6d614f3c 100644
--- a/reference/svm/book.xml
+++ b/reference/svm/book.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
+<!-- State: experimental -->
 
 <book xml:id="book.svm" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <?phpdoc extension-membership="pecl" ?>
@@ -9,6 +10,7 @@
  <preface xml:id="intro.svm">
   &reftitle.intro;
   <para>
+   &warn.experimental;
    LibSVM is an efficient solver for SVM classification and regression problems.
    The svm extension wraps this in a PHP interface for easy use in PHP scripts.
   </para>
diff --git a/reference/svn/book.xml b/reference/svn/book.xml
index a7220d83dc76..7fe106f0ced9 100644
--- a/reference/svn/book.xml
+++ b/reference/svn/book.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
+<!-- State: experimental -->
 
 <book xml:id="book.svn" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <?phpdoc extension-membership="pecl" ?>
diff --git a/reference/ui/book.xml b/reference/ui/book.xml
index 224a80a7f9b1..353dca65d15a 100644
--- a/reference/ui/book.xml
+++ b/reference/ui/book.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
+<!-- State: experimental -->
 
 <book xml:id="book.ui" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <?phpdoc extension-membership="pecl" ?>
@@ -9,7 +10,10 @@
  <preface xml:id="intro.ui">
   &reftitle.intro;
   <para>
-    This extension wraps libui to provide an OO API for the cross platform development of native look-and-feel user interfaces .
+   &warn.experimental;
+   This extension wraps <link xlink:href="&url.ui.libui;">libui</link>
+   to provide an object-oriented API for the cross platform development
+   of native look-and-feel user interfaces.
   </para>
  </preface>
 
diff --git a/reference/xdiff/configure.xml b/reference/xdiff/configure.xml
index f34a6602f702..d5460aa47fd4 100644
--- a/reference/xdiff/configure.xml
+++ b/reference/xdiff/configure.xml
@@ -7,7 +7,7 @@
   <link xlink:href="&url.pecl.package;xdiff">&url.pecl.package;xdiff</link>.
  </para>
  <para>
-  &pecl.windows.download;
+  &pecl.windows.download.avail;
  </para>
 </section>
 
diff --git a/reference/zmq/book.xml b/reference/zmq/book.xml
index d7d7ed168216..e9474c2f54ed 100644
--- a/reference/zmq/book.xml
+++ b/reference/zmq/book.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
+<!-- State: experimental -->
 
 <book xml:id="book.zmq" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <?phpdoc extension-membership="pecl" ?>
@@ -9,6 +10,7 @@
  <preface xml:id="intro.zmq">
   &reftitle.intro;
   <para>
+   &warn.experimental;
    "ØMQ is a software library that lets you quickly design and implement a fast message-based application." --0MQ Website
   </para>
   <para>
diff --git a/reference/zmq/configure.xml b/reference/zmq/configure.xml
deleted file mode 100644
index da4112cda9a5..000000000000
--- a/reference/zmq/configure.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<section xml:id="zmq.installation" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.install;
-
- <para>
-  &pecl.info;
-  <link xlink:href="&url.pecl.package;zmq">&url.pecl.package;zmq</link>
- </para>
-</section>
-
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/zmq/setup.xml b/reference/zmq/setup.xml
index bb6da40e2c9e..fca5c22d7a67 100644
--- a/reference/zmq/setup.xml
+++ b/reference/zmq/setup.xml
@@ -9,7 +9,18 @@
   <para>
    ZMQ extension requires 0MQ version 2.0.7 or higher. 0MQ can be acquired from <link xlink:href="&url.zeromq;area:download">&url.zeromq;area:download</link>.
   </para> 
-  &reference.zmq.configure;
+ </section>
+
+ <section xml:id="zmq.installation" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+  &reftitle.install;
+
+  <para>
+   &pecl.info.dead;
+   <link xlink:href="&url.pecl.package;zmq">&url.pecl.package;zmq</link>
+  </para>
+  <para>
+   &pecl.windows.download.avail;
+  </para>
  </section>
 </chapter>