diff --git a/reference/memcache/book.xml b/reference/memcache/book.xml
index 2f70dce9db..ffda4e2eaa 100644
--- a/reference/memcache/book.xml
+++ b/reference/memcache/book.xml
@@ -28,6 +28,7 @@
  &reference.memcache.setup;
  &reference.memcache.constants;
  &reference.memcache.examples;
+ &reference.memcache.memcache;
  &reference.memcache.reference;
 
 </book>
diff --git a/reference/memcache/memcache.xml b/reference/memcache/memcache.xml
new file mode 100644
index 0000000000..c5b60748d0
--- /dev/null
+++ b/reference/memcache/memcache.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- $Revision: 288721 $ -->
+
+<phpdoc:classref xml:id="class.memcache" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
+
+ <title>The Memcache class</title>
+ <titleabbrev>Memcache</titleabbrev>
+
+ <partintro>
+
+<!-- {{{ Memcache intro -->
+  <section xml:id="memcache.intro">
+   &reftitle.intro;
+   <para>
+    Represents a connection to a set of memcache servers.
+   </para>
+  </section>
+<!-- }}} -->
+
+  <section xml:id="memcache.synopsis">
+   &reftitle.classsynopsis;
+
+<!-- {{{ Synopsis -->
+   <classsynopsis>
+    <ooclass><classname>Memcache</classname></ooclass>
+
+<!-- {{{ Class synopsis -->
+    <classsynopsisinfo>
+     <ooclass>
+      <classname>Memcache</classname>
+     </ooclass>
+    </classsynopsisinfo>
+<!-- }}} -->
+    
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.memcache')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
+   </classsynopsis>
+<!-- }}} -->
+
+  </section>
+  
+ </partintro>
+
+ &reference.memcache.entities.memcache;
+
+</phpdoc:classref>
+
+<!-- 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/memcache/functions/memcache-add.xml b/reference/memcache/memcache/add.xml
similarity index 97%
rename from reference/memcache/functions/memcache-add.xml
rename to reference/memcache/memcache/add.xml
index 3795233449..d50542b8a9 100644
--- a/reference/memcache/functions/memcache-add.xml
+++ b/reference/memcache/memcache/add.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id="function.memcache-add" xmlns="http://docbook.org/ns/docbook">
+<refentry xml:id="memcache.add" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>Memcache::add</refname>
   <refpurpose>Add an item to the server</refpurpose>
diff --git a/reference/memcache/functions/memcache-addserver.xml b/reference/memcache/memcache/addserver.xml
similarity index 98%
rename from reference/memcache/functions/memcache-addserver.xml
rename to reference/memcache/memcache/addserver.xml
index e826aa6c41..94974049cd 100644
--- a/reference/memcache/functions/memcache-addserver.xml
+++ b/reference/memcache/memcache/addserver.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id="function.memcache-addserver" xmlns="http://docbook.org/ns/docbook">
+<refentry xml:id="memcache.addserver" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>Memcache::addServer</refname>
   <refpurpose>Add a memcached server to connection pool</refpurpose>
diff --git a/reference/memcache/functions/memcache-close.xml b/reference/memcache/memcache/close.xml
similarity index 96%
rename from reference/memcache/functions/memcache-close.xml
rename to reference/memcache/memcache/close.xml
index 28f8d1e92a..8688d06d7a 100644
--- a/reference/memcache/functions/memcache-close.xml
+++ b/reference/memcache/memcache/close.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id="function.memcache-close" xmlns="http://docbook.org/ns/docbook">
+<refentry xml:id="memcache.close" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>Memcache::close</refname>
   <refpurpose>Close memcached server connection</refpurpose>
diff --git a/reference/memcache/functions/memcache-connect.xml b/reference/memcache/memcache/connect.xml
similarity index 97%
rename from reference/memcache/functions/memcache-connect.xml
rename to reference/memcache/memcache/connect.xml
index 6e691a44db..22de39f2ab 100644
--- a/reference/memcache/functions/memcache-connect.xml
+++ b/reference/memcache/memcache/connect.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id="function.memcache-connect" xmlns="http://docbook.org/ns/docbook">
+<refentry xml:id="memcache.connect" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>Memcache::connect</refname>
   <refpurpose>Open memcached server connection</refpurpose>
diff --git a/reference/memcache/functions/memcache-decrement.xml b/reference/memcache/memcache/decrement.xml
similarity index 97%
rename from reference/memcache/functions/memcache-decrement.xml
rename to reference/memcache/memcache/decrement.xml
index 92aa77eeb8..143fb66a6a 100644
--- a/reference/memcache/functions/memcache-decrement.xml
+++ b/reference/memcache/memcache/decrement.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id="function.memcache-decrement" xmlns="http://docbook.org/ns/docbook">
+<refentry xml:id="memcache.decrement" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>Memcache::decrement</refname>
   <refpurpose>Decrement item's value</refpurpose>
diff --git a/reference/memcache/functions/memcache-delete.xml b/reference/memcache/memcache/delete.xml
similarity index 97%
rename from reference/memcache/functions/memcache-delete.xml
rename to reference/memcache/memcache/delete.xml
index 43535988f7..3a81e84eaf 100644
--- a/reference/memcache/functions/memcache-delete.xml
+++ b/reference/memcache/memcache/delete.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id="function.memcache-delete" xmlns="http://docbook.org/ns/docbook">
+<refentry xml:id="memcache.delete" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>Memcache::delete</refname>
   <refpurpose>Delete item from the server</refpurpose>
diff --git a/reference/memcache/functions/memcache-flush.xml b/reference/memcache/memcache/flush.xml
similarity index 95%
rename from reference/memcache/functions/memcache-flush.xml
rename to reference/memcache/memcache/flush.xml
index ef18621cf6..a3831d8a73 100644
--- a/reference/memcache/functions/memcache-flush.xml
+++ b/reference/memcache/memcache/flush.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id="function.memcache-flush" xmlns="http://docbook.org/ns/docbook">
+<refentry xml:id="memcache.flush" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>Memcache::flush</refname>
   <refpurpose>Flush all existing items at the server</refpurpose>
diff --git a/reference/memcache/functions/memcache-get.xml b/reference/memcache/memcache/get.xml
similarity index 97%
rename from reference/memcache/functions/memcache-get.xml
rename to reference/memcache/memcache/get.xml
index 1687ce2e2f..f28d7e1f18 100644
--- a/reference/memcache/functions/memcache-get.xml
+++ b/reference/memcache/memcache/get.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id="function.memcache-get" xmlns="http://docbook.org/ns/docbook">
+<refentry xml:id="memcache.get" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>Memcache::get</refname>
   <refpurpose>Retrieve item from the server</refpurpose>
diff --git a/reference/memcache/functions/memcache-getextendedstats.xml b/reference/memcache/memcache/getextendedstats.xml
similarity index 97%
rename from reference/memcache/functions/memcache-getextendedstats.xml
rename to reference/memcache/memcache/getextendedstats.xml
index 6c63bc19d8..bf1c10841e 100644
--- a/reference/memcache/functions/memcache-getextendedstats.xml
+++ b/reference/memcache/memcache/getextendedstats.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id="function.memcache-getextendedstats" xmlns="http://docbook.org/ns/docbook">
+<refentry xml:id="memcache.getextendedstats" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>Memcache::getExtendedStats</refname>
   <refpurpose>Get statistics from all servers in pool</refpurpose>
diff --git a/reference/memcache/functions/memcache-getserverstatus.xml b/reference/memcache/memcache/getserverstatus.xml
similarity index 96%
rename from reference/memcache/functions/memcache-getserverstatus.xml
rename to reference/memcache/memcache/getserverstatus.xml
index 54c43d1770..817733c67c 100644
--- a/reference/memcache/functions/memcache-getserverstatus.xml
+++ b/reference/memcache/memcache/getserverstatus.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id="function.memcache-getserverstatus" xmlns="http://docbook.org/ns/docbook">
+<refentry xml:id="memcache.getserverstatus" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>Memcache::getServerStatus</refname>
   <refpurpose>Returns server status</refpurpose>
diff --git a/reference/memcache/functions/memcache-getstats.xml b/reference/memcache/memcache/getstats.xml
similarity index 97%
rename from reference/memcache/functions/memcache-getstats.xml
rename to reference/memcache/memcache/getstats.xml
index a4e00ed993..400219f1c0 100644
--- a/reference/memcache/functions/memcache-getstats.xml
+++ b/reference/memcache/memcache/getstats.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id="function.memcache-getstats" xmlns="http://docbook.org/ns/docbook">
+<refentry xml:id="memcache.getstats" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>Memcache::getStats</refname>
   <refpurpose>Get statistics of the server</refpurpose>
diff --git a/reference/memcache/functions/memcache-getversion.xml b/reference/memcache/memcache/getversion.xml
similarity index 95%
rename from reference/memcache/functions/memcache-getversion.xml
rename to reference/memcache/memcache/getversion.xml
index 1b354081a0..bfbabb1bab 100644
--- a/reference/memcache/functions/memcache-getversion.xml
+++ b/reference/memcache/memcache/getversion.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id="function.memcache-getversion" xmlns="http://docbook.org/ns/docbook">
+<refentry xml:id="memcache.getversion" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>Memcache::getVersion</refname>
   <refpurpose>Return version of the server</refpurpose>
diff --git a/reference/memcache/functions/memcache-increment.xml b/reference/memcache/memcache/increment.xml
similarity index 97%
rename from reference/memcache/functions/memcache-increment.xml
rename to reference/memcache/memcache/increment.xml
index 846223d102..f1a2c8f0fa 100644
--- a/reference/memcache/functions/memcache-increment.xml
+++ b/reference/memcache/memcache/increment.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id="function.memcache-increment" xmlns="http://docbook.org/ns/docbook">
+<refentry xml:id="memcache.increment" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>Memcache::increment</refname>
   <refpurpose>Increment item's value</refpurpose>
diff --git a/reference/memcache/functions/memcache-pconnect.xml b/reference/memcache/memcache/pconnect.xml
similarity index 97%
rename from reference/memcache/functions/memcache-pconnect.xml
rename to reference/memcache/memcache/pconnect.xml
index ca150a72f1..fcbb30c7a2 100644
--- a/reference/memcache/functions/memcache-pconnect.xml
+++ b/reference/memcache/memcache/pconnect.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id="function.memcache-pconnect" xmlns="http://docbook.org/ns/docbook">
+<refentry xml:id="memcache.pconnect" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>Memcache::pconnect</refname>
   <refpurpose>Open memcached server persistent connection</refpurpose>
diff --git a/reference/memcache/functions/memcache-replace.xml b/reference/memcache/memcache/replace.xml
similarity index 97%
rename from reference/memcache/functions/memcache-replace.xml
rename to reference/memcache/memcache/replace.xml
index 435f875cec..6c810d27c2 100644
--- a/reference/memcache/functions/memcache-replace.xml
+++ b/reference/memcache/memcache/replace.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id="function.memcache-replace" xmlns="http://docbook.org/ns/docbook">
+<refentry xml:id="memcache.replace" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>Memcache::replace</refname>
   <refpurpose>Replace value of the existing item</refpurpose>
diff --git a/reference/memcache/functions/memcache-set.xml b/reference/memcache/memcache/set.xml
similarity index 98%
rename from reference/memcache/functions/memcache-set.xml
rename to reference/memcache/memcache/set.xml
index 8588636ea6..ee57b13db4 100644
--- a/reference/memcache/functions/memcache-set.xml
+++ b/reference/memcache/memcache/set.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id="function.memcache-set" xmlns="http://docbook.org/ns/docbook">
+<refentry xml:id="memcache.set" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>Memcache::set</refname>
   <refpurpose>Store data at the server</refpurpose>
diff --git a/reference/memcache/functions/memcache-setcompressthreshold.xml b/reference/memcache/memcache/setcompressthreshold.xml
similarity index 96%
rename from reference/memcache/functions/memcache-setcompressthreshold.xml
rename to reference/memcache/memcache/setcompressthreshold.xml
index df6fc285cb..a61bb289e7 100644
--- a/reference/memcache/functions/memcache-setcompressthreshold.xml
+++ b/reference/memcache/memcache/setcompressthreshold.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id="function.memcache-setcompressthreshold" xmlns="http://docbook.org/ns/docbook">
+<refentry xml:id="memcache.setcompressthreshold" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>Memcache::setCompressThreshold</refname>
   <refpurpose>Enable automatic compression of large values</refpurpose>
diff --git a/reference/memcache/functions/memcache-setserverparams.xml b/reference/memcache/memcache/setserverparams.xml
similarity index 98%
rename from reference/memcache/functions/memcache-setserverparams.xml
rename to reference/memcache/memcache/setserverparams.xml
index e2ff244f17..ba3b32c6c7 100644
--- a/reference/memcache/functions/memcache-setserverparams.xml
+++ b/reference/memcache/memcache/setserverparams.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id="function.memcache-setserverparams" xmlns="http://docbook.org/ns/docbook">
+<refentry xml:id="memcache.setserverparams" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>Memcache::setServerParams</refname>
   <refpurpose>Changes server parameters and status at runtime</refpurpose>