diff --git a/src/applications/files/exception/PhabricatorFileUploadException.php b/src/applications/files/exception/PhabricatorFileUploadException.php
index df7c06ff20..a856ffb2dc 100644
--- a/src/applications/files/exception/PhabricatorFileUploadException.php
+++ b/src/applications/files/exception/PhabricatorFileUploadException.php
@@ -1,31 +1,33 @@
 <?php
 
 final class PhabricatorFileUploadException extends Exception {
 
   public function __construct($code) {
     $map = array(
       UPLOAD_ERR_INI_SIZE =>
-        "Uploaded file is too large: file is larger than the ".
-        "'upload_max_filesize' setting in php.ini.",
+        pht("Uploaded file is too large: current limit is %s. To adjust ".
+          "this limit change 'upload_max_filesize' in php.ini.",
+          ini_get('upload_max_filesize')),
       UPLOAD_ERR_FORM_SIZE =>
         'File is too large.',
       UPLOAD_ERR_PARTIAL =>
         'File was only partially transferred, upload did not complete.',
       UPLOAD_ERR_NO_FILE =>
         'No file was uploaded.',
       UPLOAD_ERR_NO_TMP_DIR =>
         'Unable to write file: temporary directory does not exist.',
       UPLOAD_ERR_CANT_WRITE =>
         'Unable to write file: failed to write to temporary directory.',
       UPLOAD_ERR_EXTENSION =>
         'Unable to upload: a PHP extension stopped the upload.',
 
       -1000 =>
-        "Uploaded file exceeds limit in Phabricator ".
-        "'storage.upload-size-limit' configuration.",
+        pht("Uploaded file is too large: current limit is %s. To adjust this ".
+          "limit change 'storage.upload-size-limit' in the Phabricator config.",
+          PhabricatorEnv::getEnvConfig('storage.upload-size-limit')),
     );
 
     $message = idx($map, $code, 'Upload failed: unknown error.');
     parent::__construct($message, $code);
   }
 }