diff --git a/.arcconfig b/.arcconfig
index 3e3d9c7..200e234 100644
--- a/.arcconfig
+++ b/.arcconfig
@@ -1,10 +1,7 @@
 {
-  "project_id" : "javelin",
-  "conduit_uri" : "https://secure.phabricator.com/api/",
-  "lint_engine" : "PhutilLintEngine",
-  "remote_hooks_installed" : true,
-  "phutil_libraries" : {
-    "javelin-diviner" : "support/diviner",
-    "diviner" : "diviner/src"
-  }
+  "project.name" : "javelin",
+  "phabricator.uri" : "https://secure.phabricator.com/",
+  "load" : [
+    "support/diviner"
+  ]
 }
diff --git a/.arclint b/.arclint
new file mode 100644
index 0000000..6db1ca1
--- /dev/null
+++ b/.arclint
@@ -0,0 +1,47 @@
+{
+  "exclude": [
+    "(^externals/)"
+  ],
+  "linters": {
+    "chmod": {
+      "type": "chmod"
+    },
+    "filename": {
+      "type": "filename"
+    },
+    "generated": {
+      "type": "generated"
+    },
+    "merge-conflict": {
+      "type": "merge-conflict"
+    },
+    "nolint": {
+      "type": "nolint"
+    },
+    "phutil-xhpast": {
+      "type": "phutil-xhpast",
+      "include": "(\\.php$)"
+    },
+    "phutil-library": {
+      "type": "phutil-library",
+      "include": "(\\.php$)"
+    },
+    "text": {
+      "type": "text"
+    },
+    "spelling": {
+      "type": "spelling"
+    },
+    "xhpast": {
+      "type": "xhpast",
+      "include": "(\\.php$)",
+      "severity": {
+        "16": "advice",
+        "29": "warning",
+        "31": "error",
+        "34": "error",
+        "35": "error"
+      }
+    }
+  }
+}