diff --git a/.arcconfig b/.arcconfig
index 8811951..5024ed8 100644
--- a/.arcconfig
+++ b/.arcconfig
@@ -1,4 +1,8 @@
 {
     "project_id": "KaTeX",
-    "conduit_uri": "https://phabricator.khanacademy.org/"
+    "conduit_uri": "https://phabricator.khanacademy.org/",
+    "lint.engine": "ArcanistSingleLintEngine",
+    "lint.engine.single.linter": "ArcanistScriptAndRegexLinter",
+    "linter.scriptandregex.regex": "/^(?P<file>\\S+): line (?P<line>\\d+), col \\d+, (?P<message>.*)$/m",
+    "linter.scriptandregex.script": "make lint || true"
 }
diff --git a/Makefile b/Makefile
index d5d517d..74bb686 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ export UGLIFYJS = $(realpath ./node_modules/.bin/uglifyjs) \
 setup:
 	npm install
 
-lint: katex.js $(wildcard src/*.js)
+lint: katex.js server.js cli.js $(wildcard src/*.js) $(wildcard test/*.js) $(wildcard contrib/*/*.js)
 	./node_modules/.bin/jshint $^
 
 build/katex.js: katex.js $(wildcard src/*.js)
diff --git a/contrib/auto-render/auto-render-spec.js b/contrib/auto-render/auto-render-spec.js
index c64b15e..8402c44 100644
--- a/contrib/auto-render/auto-render-spec.js
+++ b/contrib/auto-render/auto-render-spec.js
@@ -1,3 +1,9 @@
+/* global beforeEach: false */
+/* global jasmine: false */
+/* global expect: false */
+/* global it: false */
+/* global describe: false */
+
 var splitAtDelimiters = require("./splitAtDelimiters");
 
 beforeEach(function() {
@@ -28,6 +34,7 @@ beforeEach(function() {
                         var correct = result[i];
 
                         var good = true;
+                        var diff;
 
                         if (real.type !== correct.type) {
                             good = false;
diff --git a/contrib/auto-render/auto-render.js b/contrib/auto-render/auto-render.js
index b3d3de6..6eb2f93 100644
--- a/contrib/auto-render/auto-render.js
+++ b/contrib/auto-render/auto-render.js
@@ -1,3 +1,5 @@
+/* global katex */
+
 var splitAtDelimiters = require("./splitAtDelimiters");
 
 var splitWithDelimiters = function(text, delimiters) {
@@ -48,9 +50,8 @@ var renderElem = function(elem, delimiters, ignoredTags) {
             if (shouldRender) {
                 renderElem(childNode, delimiters, ignoredTags);
             }
-        } else {
-            // Something else, ignore
         }
+        // Otherwise, it's something else, and ignore it.
     }
 };
 
diff --git a/server.js b/server.js
index b6b1f5d..bf66e24 100644
--- a/server.js
+++ b/server.js
@@ -61,10 +61,10 @@ app.get("/katex.css", function(req, res, next) {
     });
 });
 
-app.use(express.static(path.join(__dirname, "static")));
-app.use(express.static(path.join(__dirname, "build")));
-app.use("/test", express.static(path.join(__dirname, "test")));
-app.use("/contrib", express.static(path.join(__dirname, "contrib")));
+app.use(express["static"](path.join(__dirname, "static")));
+app.use(express["static"](path.join(__dirname, "build")));
+app.use("/test", express["static"](path.join(__dirname, "test")));
+app.use("/contrib", express["static"](path.join(__dirname, "contrib")));
 
 app.use(function(err, req, res, next) {
     console.error(err.stack);
diff --git a/test/katex-spec.js b/test/katex-spec.js
index ed102cb..de8df35 100644
--- a/test/katex-spec.js
+++ b/test/katex-spec.js
@@ -1,3 +1,9 @@
+/* global beforeEach: false */
+/* global jasmine: false */
+/* global expect: false */
+/* global it: false */
+/* global describe: false */
+
 var buildHTML = require("../src/buildHTML");
 var buildMathML = require("../src/buildMathML");
 var katex = require("../katex");