diff --git a/language/oop5/constants.xml b/language/oop5/constants.xml
index 0d124eb542..c7bcfda07a 100644
--- a/language/oop5/constants.xml
+++ b/language/oop5/constants.xml
@@ -1,20 +1,21 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.8 $ -->
+<!-- $Revision: 1.9 $ -->
  <sect1 xml:id="language.oop5.constants" xmlns="http://docbook.org/ns/docbook">
   <title>Class Constants</title>
   <para>
    It is possible to define constant values on a per-class basis remaining the
    same and unchangeable. Constants differ from normal variables in that you
-   don't use the <varname>$</varname> symbol to declare or use them.  Like
-   <link linkend="language.oop5.static">static</link> members, constant values
-   cannot be accessed from an instance of the object (using
-   <literal>$object::constant</literal>).
+   don't use the <varname>$</varname> symbol to declare or use them. 
   </para>
   <para>
    The value must be a constant expression, not (for example) a variable, a
    class member, result of a mathematical operation or a function call.
   </para>
 
+  <para>
+   As of PHP 5.2.4, it's possible to reference the class using a variable.
+  </para>
+
   <example>
    <title>Defining and using a constant</title>
    <programlisting role="php">
@@ -31,9 +32,13 @@ class MyClass
 
 echo MyClass::constant . "\n";
 
+$classname = "MyClass";
+echo $classname::constant . "\n";
+
 $class = new MyClass();
 $class->showConstant();
-// echo $class::constant;  is not allowed
+
+echo $class::constant."\n";
 ?>
 ]]>
    </programlisting>
diff --git a/language/oop5/paamayim-nekudotayim.xml b/language/oop5/paamayim-nekudotayim.xml
index 3d5dd2d6f2..22593da4a5 100644
--- a/language/oop5/paamayim-nekudotayim.xml
+++ b/language/oop5/paamayim-nekudotayim.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.8 $ -->
+<!-- $Revision: 1.9 $ -->
  <sect1 xml:id="language.oop5.paamayim-nekudotayim" xmlns="http://docbook.org/ns/docbook">
   <title>Scope Resolution Operator (::)</title>
 
@@ -16,6 +16,10 @@
    the name of the class.
   </para>
 
+  <para>
+   As of PHP 5.2.4, it's possible to reference the class using a variable.
+  </para>
+
   <para>
    Paamayim Nekudotayim would, at first, seem like a strange choice for
    naming a double-colon. However, while writing the Zend Engine 0.5
@@ -32,6 +36,9 @@ class MyClass {
     const CONST_VALUE = 'A constant value';
 }
 
+$classname = 'MyClass';
+echo $classname::CONST_VALUE;
+
 echo MyClass::CONST_VALUE;
 ?>
 ]]>
@@ -58,6 +65,9 @@ class OtherClass extends MyClass
     }
 }
 
+$classname = 'OtherClass';
+echo $classname::doubleColon();
+
 OtherClass::doubleColon();
 ?>
 ]]>
diff --git a/language/oop5/static.xml b/language/oop5/static.xml
index 62f3c68d55..d58e50b465 100644
--- a/language/oop5/static.xml
+++ b/language/oop5/static.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.11 $ -->
+<!-- $Revision: 1.12 $ -->
  <sect1 xml:id="language.oop5.static" xmlns="http://docbook.org/ns/docbook">
   <title>Static Keyword</title>
 
@@ -23,15 +23,6 @@
    not available inside the method declared as static.
   </para>
   
-  <para>
-   In fact <literal>static</literal> method calls are resolved at compile 
-   time. When using an explicit class name the method is already identified
-   completely and no inheritance rules apply. If the call is done by 
-   <literal>self</literal> then <literal>self</literal> is translated to 
-   the current class, that is the class the code belongs to. Here also no 
-   inheritance rules apply.
-  </para>
-  
   <para>
    Static properties cannot be accessed through the object using the arrow
    operator -&gt;.
@@ -41,6 +32,10 @@
    Calling non-static methods statically generates an E_STRICT level warning.
   </para>
 
+  <para>
+   As of PHP 5.2.4, it's possible to reference the class  using a variable.
+  </para>
+
   <example>
    <title>Static member example</title>
    <programlisting role="php">
@@ -74,6 +69,9 @@ print $foo->my_static . "\n";      // Undefined "Property" my_static
 print Bar::$my_static . "\n";
 $bar = new Bar();
 print $bar->fooStatic() . "\n";
+
+$classname = "Bar";
+print $classname::$my_static;
 ?>
 ]]>
    </programlisting>
@@ -91,6 +89,9 @@ class Foo {
 }
 
 Foo::aStaticMethod();
+
+$classname = "Foo";
+print $classname::aStaticMethod();
 ?> 
 ]]>
     </programlisting>