diff --git a/INSTALL b/INSTALL
index af80a727c..e79294f63 100644
--- a/INSTALL
+++ b/INSTALL
@@ -11,7 +11,7 @@ Dependencies
 ------------
 
 gcc - http://gcc.gnu.org/
-Any other C99 compliant compiler should also work.
+Any other C++11 compliant compiler should also work.
 
 GLib 2.28 - http://www.gtk.org/
 General-purpose utility library.
diff --git a/doc/developer.xml b/doc/developer.xml
index eb318fa5a..3b6d0a086 100644
--- a/doc/developer.xml
+++ b/doc/developer.xml
@@ -32,23 +32,16 @@
 
       <listitem>
         <para>
-          don't write CPP when you can write C: use inline functions
-          and enums instead of macros
+          don't write CPP when you can write C++: use inline
+          functions and constexpr instead of macros
         </para>
       </listitem>
 
       <listitem>
         <para>
-          the code should be C99 compliant, and must compile with
-          <application>GCC</application>;
-          <application>clang</application> support is highly desirable
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          C++ is ok (for integrating C++ only libraries), but it
-          should be avoided
+          the code should be C++11 compliant, and must compile with
+          <application>GCC</application> 4.6 and
+          <application>clang</application> 3.2
         </para>
       </listitem>