diff --git a/reference/intl/book.xml b/reference/intl/book.xml
index d2e38c7fba..3995c1ed54 100644
--- a/reference/intl/book.xml
+++ b/reference/intl/book.xml
@@ -103,6 +103,8 @@
  &reference.intl.grapheme;
  &reference.intl.idn;
 
+ &reference.intl.intlexception;
+
  &reference.intl.reference;
 </book>
 
diff --git a/reference/intl/ini.xml b/reference/intl/ini.xml
index b91c34115c..527657c92d 100644
--- a/reference/intl/ini.xml
+++ b/reference/intl/ini.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
 
-<section xml:id="intl.configuration" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+<section xml:id="intl.configuration" xmlns="http://docbook.org/ns/docbook"
+ xmlns:xlink="http://www.w3.org/1999/xlink">
  &reftitle.runtime;
  &extension.runtime;
-
  <para>
   <table>
    <title>Intl &ConfigureOptions;</title>
@@ -24,29 +24,86 @@
       <entry>PHP_INI_ALL</entry>
       <entry></entry>
      </row>
+     <row>
+      <entry><link linkend="ini.intl.error-level">intl.error_level</link></entry>
+      <entry>0</entry>
+      <entry>PHP_INI_ALL</entry>
+      <entry></entry>
+     </row>
+     <row>
+      <entry><link linkend="ini.intl.use-exceptions">intl.use_exceptions</link></entry>
+      <entry>0</entry>
+      <entry>PHP_INI_ALL</entry>
+      <entry>Available since PHP 5.5 and PECL 3.0.0a1</entry>
+     </row>
     </tbody>
    </tgroup>
   </table>
-
-  &ini.php.constants;
-
  </para>
- 
+
  &ini.descriptions.title;
- 
+
  <para>
   <variablelist>
-
    <varlistentry xml:id="ini.intl.default-locale">
-    <term>
-     <parameter>intl.default_locale</parameter>
-     <type>string</type>
-    </term>
-    <listitem>
-     <para>
-     </para>
-    </listitem>
-   </varlistentry>
+     <term>
+      <parameter>intl.default_locale</parameter>
+      <type>string</type>
+     </term>
+     <listitem>
+      <para>
+       The locale that will be used in intl functions when none is specified
+       (either by omitting the corresponding argument or by passing
+       <literal>NULL</literal>). These are ICU locales, not system locales.
+       The built-in ICU locales and their data can be explored at
+       <link xlink:href="&url.icu.locales;"/>.
+      </para>
+      <para>
+       The default value is empty, which forces the usage of ICU's default
+       locale. Once set, the ini setting cannot be reset to this default value.
+       It is not recommended that this default be relied on, as its effective
+       value depends on the server's environment.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry xml:id="ini.intl.error-level">
+     <term>
+      <parameter>intl.error_level</parameter>
+      <type>integer</type>
+     </term>
+     <listitem>
+      <para>
+       The level of the error messages generated when an error occurs in ICU
+       functions. This is a PHP error level, such as
+       <constant>E_WARNING</constant>. It can be set to <literal>0</literal>
+       in order to inhibit the messages. This does not affect the return values
+       indicating error or the values returned by
+       <function>intl_get_error_code</function> or by the class specific
+       methods for retrieving error codes and messages.
+       Choosing <literal>E_ERROR</literal> will terminate the script whenever
+       an error condition is found on intl classes.
+      </para>
+      <para>
+       The default value is <literal>0</literal>.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry xml:id="ini.intl.use-exceptions">
+     <term>
+      <parameter>intl.use_exceptions</parameter>
+      <type>integer</type>
+     </term>
+     <listitem>
+      <para>
+       If set to true, an exception will be raised whenever an error occurs in
+       an intl function. The exception will be of type
+       <classname>IntlException</classname>. This is possibly in addition to the
+       error message generated due to <link
+        linkend="ini.intl.error-level">intl.error_level</link>.
+      </para>
+      <para>The default value is &false;.</para>
+     </listitem>
+    </varlistentry>
 
   </variablelist>
  </para>
@@ -72,4 +129,3 @@ vim600: syn=xml fen fdm=syntax fdl=2 si
 vim: et tw=78 syn=sgml
 vi: ts=1 sw=1
 -->
-
diff --git a/reference/intl/versions.xml b/reference/intl/versions.xml
index f7a185ba7e..1e1e00b005 100644
--- a/reference/intl/versions.xml
+++ b/reference/intl/versions.xml
@@ -5,6 +5,7 @@
 -->
 
 <versions>
+ <function name="intlexception" from='PHP 5 &gt; 5.5.0, PECL intl &gt; 3.0.0a1'/>
  <!-- Methods -->
  <function name='collator' from='PHP 5 &gt;= 5.3.0, PECL intl &gt;= 1.0.0'/>
  <function name='collator::__construct' from='PHP 5 &gt;= 5.3.0, PECL intl &gt;= 1.0.0'/>