diff --git a/.arcconfig b/.arcconfig
index fa78c6db09ae..a759f47d119f 100644
--- a/.arcconfig
+++ b/.arcconfig
@@ -1,5 +1,4 @@
 {
 	"project.name": "S",
-	"phabricator.uri" : "https://reviews.freebsd.org/",
-	"history.immutable" : true
+	"phabricator.uri" : "https://reviews.freebsd.org/"
 }
diff --git a/.arclint b/.arclint
index e1534587c5ad..31bda09b1a83 100644
--- a/.arclint
+++ b/.arclint
@@ -1,9 +1,25 @@
 {
+  "exclude": "(contrib|crypto)",
   "linters": {
     "python": {
       "type": "pep8",
-      "exclude": "(contrib)",
       "include": "(\\.py$)"
+    },
+    "spelling": {
+      "type": "spelling"
+    },
+    "chmod": {
+      "type": "chmod"
+    },
+    "merge-conflict": {
+      "type": "merge-conflict"
+    },
+    "filename": {
+      "type": "filename"
+    },
+    "json": {
+      "type": "json",
+      "include": "(\\.arclint|\\.json$)"
     }
   }
 }