diff --git a/ChangeLog b/ChangeLog
index 9373a4bbdb..324b1e6aac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -31,6 +31,9 @@ phpMyAdmin - ChangeLog
 + rfe #1385 Hide tables, functions, procedures, events and views in navigation tree
 + rfe #1321 Export view as if it was a table
 
+4.0.6.0 (not yet released)
+- bug #4036 Call to undefined function mb_detect_encoding (clarify the doc)
+
 4.0.5.0 (not yet released)
 - bug #3977 Not detected configuration storage
 - bug #3970 Pressing enter in the filter field reloads page
diff --git a/doc/require.rst b/doc/require.rst
index e45e8fef8c..35dc229790 100644
--- a/doc/require.rst
+++ b/doc/require.rst
@@ -13,13 +13,10 @@ PHP
 ---
 
 * You need PHP 5.3.0 or newer, with ``session`` support, the Standard PHP Library 
-  (SPL) extension and JSON support.
+  (SPL) extension, JSON support, and the ``mbstring`` and ``ctype`` extensions.
 
 * To support uploading of ZIP files, you need the PHP ``zip`` extension.
 
-* For proper support of multibyte strings (eg. UTF-8, which is currently
-  the default), you should install the ``mbstring`` and ``ctype`` extensions.
-
 * You need GD2 support in PHP to display inline thumbnails of JPEGs
   ("image/jpeg: inline") with their original aspect ratio.