diff --git a/src/infrastructure/lint/PhabricatorLintEngine.php b/src/infrastructure/lint/PhabricatorLintEngine.php
index 391d9fb5d1..28fb9967e6 100644
--- a/src/infrastructure/lint/PhabricatorLintEngine.php
+++ b/src/infrastructure/lint/PhabricatorLintEngine.php
@@ -5,6 +5,24 @@ final class PhabricatorLintEngine extends PhutilLintEngine {
   public function buildLinters() {
     $linters = parent::buildLinters();
 
+    foreach ($linters as $linter) {
+      if ($linter instanceof ArcanistPhutilXHPASTLinter) {
+        $linter->setDeprecatedFunctions(array(
+          'phutil_escape_html' =>
+            'The phutil_escape_html() function is deprecated. Raw strings '.
+            'passed to phutil_tag() or hsprintf() are escaped automatically.',
+
+          'javelin_render_tag' =>
+            'The javelin_render_tag() function is deprecated and unsafe. '.
+            'Use javelin_tag() instead.',
+
+          'phabricator_render_form' =>
+            'The phabricator_render_form() function is deprecated and unsafe. '.
+            'Use phabricator_form() instead.',
+        ));
+      }
+    }
+
     $paths = $this->getPaths();
 
     foreach ($paths as $key => $path) {