diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index e00cbb07ba..17e81b566a 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -1286,6 +1286,7 @@ phutil_register_library_map(array(
     'PhabricatorSetupCheckMySQL' => 'applications/config/check/PhabricatorSetupCheckMySQL.php',
     'PhabricatorSetupCheckPHPConfig' => 'applications/config/check/PhabricatorSetupCheckPHPConfig.php',
     'PhabricatorSetupCheckPath' => 'applications/config/check/PhabricatorSetupCheckPath.php',
+    'PhabricatorSetupCheckPygment' => 'applications/config/check/PhabricatorSetupCheckPygment.php',
     'PhabricatorSetupCheckStorage' => 'applications/config/check/PhabricatorSetupCheckStorage.php',
     'PhabricatorSetupCheckTimezone' => 'applications/config/check/PhabricatorSetupCheckTimezone.php',
     'PhabricatorSetupIssue' => 'applications/config/issue/PhabricatorSetupIssue.php',
@@ -2756,6 +2757,7 @@ phutil_register_library_map(array(
     'PhabricatorSetupCheckMySQL' => 'PhabricatorSetupCheck',
     'PhabricatorSetupCheckPHPConfig' => 'PhabricatorSetupCheck',
     'PhabricatorSetupCheckPath' => 'PhabricatorSetupCheck',
+    'PhabricatorSetupCheckPygment' => 'PhabricatorSetupCheck',
     'PhabricatorSetupCheckStorage' => 'PhabricatorSetupCheck',
     'PhabricatorSetupCheckTimezone' => 'PhabricatorSetupCheck',
     'PhabricatorSetupIssueExample' => 'PhabricatorUIExample',
diff --git a/src/applications/config/check/PhabricatorSetupCheckPygment.php b/src/applications/config/check/PhabricatorSetupCheckPygment.php
new file mode 100644
index 0000000000..7777356c9f
--- /dev/null
+++ b/src/applications/config/check/PhabricatorSetupCheckPygment.php
@@ -0,0 +1,31 @@
+<?php
+
+final class PhabricatorSetupCheckPygment extends PhabricatorSetupCheck {
+
+  protected function executeChecks() {
+
+    $pygment = PhabricatorEnv::getEnvConfig('pygments.enabled');
+
+    if ($pygment) {
+      list($err) = exec_manual('pgymentize -h');
+      if ($err) {
+        $summary = pht(
+          'You enabled pygments but the pygmentize script is not '.
+          'actually available, your $PATH is probably broken.');
+
+        $message = pht(
+          'The environmental variable $PATH does not contain '.
+          'pygmentize. You have enabled pygments, which requires '.
+          'pygmentize to be available in your $PATH variable.');
+
+        $this
+          ->newIssue('pygments.enabled')
+          ->setName(pht('pygmentize Not Found'))
+          ->setSummary($summary)
+          ->setMessage($message)
+          ->addPhabricatorConfig('pygments.enabled')
+          ->addPhabricatorConfig('envinronment.append-paths');
+      }
+    }
+  }
+}