diff --git a/features/file-upload.xml b/features/file-upload.xml
index eeb19f074d..e1b234b2e8 100644
--- a/features/file-upload.xml
+++ b/features/file-upload.xml
@@ -385,6 +385,17 @@ foreach ($_FILES["pictures"]["error"] as $key => $error) {
     small, large files cannot be uploaded.  Make sure you set
     <literal>post_max_size</literal> large enough.
    </simpara>
+   <simpara>
+    Since PHP 5.2.12, the
+    <link linkend="ini.max-file-uploads">max_file_uploads</link> configuration
+    setting controls the maximum number of files that can uploaded in one
+    request. If more files are uploaded than the limit, then
+    <varname>$_FILES</varname> will stop processing files once the limit is
+    reached. For example, if
+    <link linkend="ini.max-file-uploads">max_file_uploads</link> is set to
+    <literal>10</literal>, then <varname>$_FILES</varname> will never contain
+    more than 10 items.
+   </simpara>
    <simpara>
     Not validating which file you operate on may mean that users can access
     sensitive information in other directories.
@@ -462,6 +473,15 @@ foreach ($_FILES["pictures"]["error"] as $key => $error) {
     <varname>$_FILES['userfile']['type'][0]</varname> are
     also set.
    </simpara>
+   <warning>
+    <simpara>
+     Since PHP 5.2.12, the
+     <link linkend="ini.max-file-uploads">max_file_uploads</link>
+     configuration setting acts as a limit on the number of files that can be
+     uploaded in one request. You will need to ensure that your form does not
+     try to upload more files in one request than this limit.
+    </simpara>
+   </warning>
   </sect1>
 
   <sect1 xml:id="features.file-upload.put-method">