diff --git a/reference/classkit/configure.xml b/reference/classkit/configure.xml
index d8fe741d81..c499b537db 100644
--- a/reference/classkit/configure.xml
+++ b/reference/classkit/configure.xml
@@ -3,14 +3,8 @@
 <section xml:id="classkit.installation" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  &reftitle.install;
  <para>
-  &pecl.moved;
- </para>
- <para>
-  &pecl.info;
-  <link xlink:href="&url.pecl.package;classkit">&url.pecl.package;classkit</link>.
- </para>
- <para>
-  &pecl.windows.download;
+  &pecl.info.dead;
+  <link xlink:href="&url.pecl.vcs;classkit">&url.pecl.vcs;classkit</link>.
  </para>
 </section>
 
diff --git a/reference/iisfunc/book.xml b/reference/iisfunc/book.xml
index 0378b4eada..9d1f1272f2 100644
--- a/reference/iisfunc/book.xml
+++ b/reference/iisfunc/book.xml
@@ -11,24 +11,12 @@
  <preface xml:id="intro.iisfunc">
   &reftitle.intro;
   <para>
-   &pecl.moved;
-   <!--
-   Not yet available
-   &pecl.info;
-   <link xlink:href="&url.pecl.package;iisfunc">&url.pecl.package;iisfunc</link>.
-   -->
    This extension is available for Win32 only. It provides functions
    to administrate Microsoft Internet Information Server (IIS).
    The extension includes function to create web sites and virtual
    directories as well as configuring security and script mapping.
    These functions have been added in PHP 4.
   </para>
-  <para>
-   In order to use these functions you must enable the
-   <filename>php_iisfunc.dll</filename> DLL inside of &php.ini;.
-   &pecl.windows.download;
-  </para>
-
  </preface>
  <!-- }}} -->
  
diff --git a/reference/msession/configure.xml b/reference/msession/configure.xml
index a0ac26e16d..9e7696cb41 100644
--- a/reference/msession/configure.xml
+++ b/reference/msession/configure.xml
@@ -3,15 +3,12 @@
 <section xml:id="msession.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;msession">&url.pecl.package;msession</link>.
+  &pecl.info.dead;
+  <link xlink:href="&url.pecl.vcs;msession">&url.pecl.vcs;msession</link>.
  </para>
  <para>
   &pecl.moved-ver;5.1.3
  </para>
- <para>
-  &pecl.windows.download;
- </para>
 </section>
 
 <!-- Keep this comment at the end of the file
diff --git a/reference/nis/configure.xml b/reference/nis/configure.xml
index e3499ad553..46abdd435e 100644
--- a/reference/nis/configure.xml
+++ b/reference/nis/configure.xml
@@ -3,8 +3,8 @@
 <section xml:id="nis.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;yp">&url.pecl.package;yp</link>
+  &pecl.info.dead;
+  <link xlink:href="&url.pecl.vcs;yp">&url.pecl.vcs;yp</link>
  </para>
 </section>
 
diff --git a/reference/notes/book.xml b/reference/notes/book.xml
index b4d50141d2..1403fee3ff 100644
--- a/reference/notes/book.xml
+++ b/reference/notes/book.xml
@@ -10,19 +10,6 @@
  <!-- {{{ preface -->
  <preface xml:id="intro.notes">
   &reftitle.intro;
-  <note>
-   <para>
-    &pecl.moved-ver;5.0.0.
-    &pecl.info;
-    <link xlink:href="&url.pecl.package;notes">&url.pecl.package;notes</link>.
-   </para>
-  </note>
-  <warning>
-   <para>
-    This extension is currently not supported, thus looking for a
-    maintainer.
-   </para>
-  </warning>
   &warn.experimental;
  </preface>
  <!-- }}} -->
diff --git a/reference/notes/setup.xml b/reference/notes/setup.xml
index 090dc0886c..3c64d5943e 100644
--- a/reference/notes/setup.xml
+++ b/reference/notes/setup.xml
@@ -16,7 +16,7 @@
   &reftitle.install;
   <para>
    &pecl.info.dead;
-   <link xlink:href="&url.pecl.package;notes">&url.pecl.package;notes</link>.
+   <link xlink:href="&url.pecl.vcs;notes">&url.pecl.vcs;notes</link>.
   </para>
   <para>
    &pecl.moved-ver;5.0.0