diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 66a3932577..846e54efc7 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -1383,6 +1383,7 @@ phutil_register_library_map(array(
     'PhabricatorSetupCheckExtensions' => 'applications/config/check/PhabricatorSetupCheckExtensions.php',
     'PhabricatorSetupCheckExtraConfig' => 'applications/config/check/PhabricatorSetupCheckExtraConfig.php',
     'PhabricatorSetupCheckFacebook' => 'applications/config/check/PhabricatorSetupCheckFacebook.php',
+    'PhabricatorSetupCheckFileinfo' => 'applications/config/check/PhabricatorSetupCheckFileinfo.php',
     'PhabricatorSetupCheckGD' => 'applications/config/check/PhabricatorSetupCheckGD.php',
     'PhabricatorSetupCheckImagemagick' => 'applications/config/check/PhabricatorSetupCheckImagemagick.php',
     'PhabricatorSetupCheckInvalidConfig' => 'applications/config/check/PhabricatorSetupCheckInvalidConfig.php',
@@ -3114,6 +3115,7 @@ phutil_register_library_map(array(
     'PhabricatorSetupCheckExtensions' => 'PhabricatorSetupCheck',
     'PhabricatorSetupCheckExtraConfig' => 'PhabricatorSetupCheck',
     'PhabricatorSetupCheckFacebook' => 'PhabricatorSetupCheck',
+    'PhabricatorSetupCheckFileinfo' => 'PhabricatorSetupCheck',
     'PhabricatorSetupCheckGD' => 'PhabricatorSetupCheck',
     'PhabricatorSetupCheckImagemagick' => 'PhabricatorSetupCheck',
     'PhabricatorSetupCheckInvalidConfig' => 'PhabricatorSetupCheck',
diff --git a/src/applications/config/check/PhabricatorSetupCheckFileinfo.php b/src/applications/config/check/PhabricatorSetupCheckFileinfo.php
new file mode 100644
index 0000000000..9859b973b5
--- /dev/null
+++ b/src/applications/config/check/PhabricatorSetupCheckFileinfo.php
@@ -0,0 +1,17 @@
+<?php
+
+final class PhabricatorSetupCheckFileinfo extends PhabricatorSetupCheck {
+
+  protected function executeChecks() {
+    if (!extension_loaded('fileinfo')) {
+      $message = pht(
+        "The 'fileinfo' extension is not installed. Without 'fileinfo', ".
+        "support, Phabricator may not be able to determine the MIME types ".
+        "of uploaded files.");
+
+      $this->newIssue('extension.fileinfo')
+        ->setName(pht("Missing 'fileinfo' Extension"))
+        ->setMessage($message);
+    }
+  }
+}