diff --git a/appendices/tokens.xml b/appendices/tokens.xml
index 2fb8db73fb..adfe991872 100644
--- a/appendices/tokens.xml
+++ b/appendices/tokens.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.26 $ -->
+<!-- $Revision: 1.27 $ -->
 
 <appendix xml:id="tokens" xmlns="http://docbook.org/ns/docbook">
  <title>List of Parser Tokens</title>
@@ -96,6 +96,14 @@
      <entry>class</entry>
      <entry><link linkend="language.oop">classes and objects</link></entry>
     </row>
+    <row>
+     <entry>T_CLASS_C</entry>
+     <entry>__CLASS__</entry>
+     <entry>
+      <link linkend="language.constants">constants</link>
+      (available since PHP 4.3.0)
+     </entry>
+    </row>
     <row>
      <entry>T_CLONE</entry>
      <entry>clone</entry>
@@ -310,6 +318,14 @@
      <entry>function or cfunction</entry>
      <entry><link linkend="language.functions">functions</link></entry>
     </row>
+    <row>
+     <entry>T_FUNC_C</entry>
+     <entry>__FUNCTION__</entry>
+     <entry>
+      <link linkend="language.constants">constants</link>
+      (available since PHP 4.3.0)
+     </entry>
+    </row>
     <row>
      <entry>T_GLOBAL</entry>
      <entry>global</entry>
@@ -435,6 +451,14 @@
      <entry>xor</entry>
      <entry><link linkend="language.operators.logical">logical operators</link></entry>
     </row>
+    <row>
+     <entry>T_METHOD_C</entry>
+     <entry>__METHOD__</entry>
+     <entry>
+      <link linkend="language.constants">constants</link>
+      (available since PHP 5.0.0)
+     </entry>
+    </row>
     <row>
      <entry>T_MINUS_EQUAL</entry>
      <entry>-=</entry>
@@ -459,6 +483,15 @@
      <entry><link linkend="language.operators.assignment">assignment
      operators</link></entry>
     </row>
+    <row>
+     <entry>T_NS_C</entry>
+     <entry>__NAMESPACE__</entry>
+     <entry>
+      <link linkend="language.namespaces">namespaces</link>.
+      Also defined as <constant>T_NAMESPACE</constant>
+      (available since PHP 5.3.0)
+     </entry>
+    </row>
     <row>
      <entry>T_NEW</entry>
      <entry>new</entry>
@@ -636,7 +669,8 @@
     <row>
      <entry>T_USE</entry>
      <entry>use</entry>
-     <entry>(not implemented)</entry>
+     <entry><link linkend="language.namespaces">namespaces</link>
+     (available since PHP 5.3.0)</entry>
     </row>
     <row>
      <entry>T_VAR</entry>
@@ -665,22 +699,6 @@
      <entry><link linkend="language.operators.assignment">assignment
      operators</link></entry>
     </row>
-    <row>
-     <entry>T_FUNC_C</entry>
-     <entry>__FUNCTION__</entry>
-     <entry>
-      <link linkend="language.constants">constants</link>
-      (available since PHP 4.3.0)
-     </entry>
-    </row>
-    <row>
-     <entry>T_CLASS_C</entry>
-     <entry>__CLASS__</entry>
-     <entry>
-      <link linkend="language.constants">constants</link>
-      (available since PHP 4.3.0)
-     </entry>
-    </row>
    </tbody> 
   </tgroup>
  </table>