diff --git a/appendices/reserved.xml b/appendices/reserved.xml
index 58f4575d3b..64269393c6 100755
--- a/appendices/reserved.xml
+++ b/appendices/reserved.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.22 $ -->
+<!-- $Revision: 1.23 $ -->
 
  <appendix id="reserved">
   <title>List of Reserved Words</title>
@@ -199,6 +199,12 @@
        <entry>
         <link linkend="control-structures.while">while</link>
        </entry>
+       <entry>
+        <constant>__FUNCTION__</constant>
+       </entry>
+       <entry>
+        <constant>__CLASS__</constant>
+       </entry>
       </row>
      </tbody>
     </tgroup>
diff --git a/appendices/tokens.xml b/appendices/tokens.xml
index ef9e4a447d..25bbd2cdb3 100644
--- a/appendices/tokens.xml
+++ b/appendices/tokens.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
 
 <appendix id="tokens">
  <title>List of Parser Tokens</title>
@@ -570,6 +570,24 @@
      <entry><link linkend="language.operators.assignment">assignment
      operators</link></entry>
     </row>
+    <row>
+     <entry>T_XOR_EQUAL</entry>
+     <entry>^=</entry>
+     <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>, since
+     <literal>PHP</literal> 4.3.0</entry>
+    </row>
+    <row>
+     <entry>T_CLASS_C</entry>
+     <entry>__CLASS__</entry>
+     <entry><link linkend="language.constants">constants</link>, since
+     <literal>PHP</literal> 4.3.0</entry>
+    </row>
    </tbody> 
   </tgroup>
  </table>