diff --git a/.arclint b/.arclint
index d1b3f2fab..4952f16e6 100644
--- a/.arclint
+++ b/.arclint
@@ -1,140 +1,140 @@
 {
     "linters": {
         "generated": {
             "type": "generated"
         },
         "clang-format": {
             "type": "clang-format",
-            "version": "7.0",
+            "version": ">=7.0",
             "bin": ["clang-format-7", "clang-format"],
             "include": "(^src/.*\\.(h|c|cpp|mm)$)",
             "exclude": [
                 "(^src/(secp256k1|univalue|leveldb)/)"
             ]
         },
         "autopep8": {
             "type": "autopep8",
             "version": ">=1.3.4",
             "include": "(\\.py$)"
         },
         "flake8": {
             "type": "flake8",
             "include": "(\\.py$)",
             "flags": [
                 "--select=E112,E113,E115,E116,E125,E131,E133,E223,E224,E242,E266,E271,E272,E273,E274,E275,E304,E306,E401,E402,E502,E701,E702,E703,E714,E721,E741,E742,E743,E901,E902,F401,F402,F403,F404,F405,F406,F407,F601,F602,F621,F622,F631,F701,F702,F703,F704,F705,F706,F707,F811,F812,F821,F822,F823,F831,W292,W293,W601,W602,W603,W604,W605,W606"
             ]
         },
         "lint-format-strings": {
             "type": "lint-format-strings",
             "include": "(^src/.*\\.(h|c|cpp)$)",
             "exclude": [
                 "(^src/(secp256k1|univalue|leveldb)/)"
             ]
         },
         "check-doc": {
             "type": "check-doc",
             "include": "(^src/.*\\.(h|c|cpp)$)"
         },
         "lint-tests": {
             "type": "lint-tests",
             "include": "(^src/(rpc/|wallet/)?test/.*\\.(cpp)$)"
         },
         "lint-python-format": {
             "type": "lint-python-format",
             "include": "(\\.py$)",
             "exclude": [
                 "(^test/lint/lint-python-format\\.py$)"
             ]
         },
         "phpcs": {
             "type": "phpcs",
             "include": "(\\.php$)",
             "exclude": [
                 "(^arcanist/__phutil_library_.+\\.php$)"
             ],
             "phpcs.standard": "arcanist/phpcs.xml"
         },
         "lint-locale-dependence": {
             "type": "lint-locale-dependence",
             "include": "(^src/.*\\.(h|cpp)$)",
             "exclude": [
                 "(^src/(crypto/ctaes/|leveldb/|secp256k1/|seeder/|tinyformat.h|univalue/))"
             ]
         },
         "lint-cheader": {
             "type": "lint-cheader",
             "include": "(^src/.*\\.(h|cpp)$)",
             "exclude": [
                 "(^src/(crypto/ctaes|secp256k1|univalue|leveldb)/)"
             ]
         },
         "spelling": {
             "type": "spelling",
             "exclude": [
                 "(^build-aux/m4/)",
                 "(^depends/)",
                 "(^doc/release-notes/)",
                 "(^src/(qt/locale|secp256k1|univalue|leveldb)/)",
                 "(^test/lint/dictionary/)"
             ],
             "spelling.dictionaries": [
                 "test/lint/dictionary/english.json"
             ]
         },
         "lint-assert-with-side-effects": {
             "type": "lint-assert-with-side-effects",
             "include": "(^src/.*\\.(h|cpp)$)",
             "exclude": [
                 "(^src/(secp256k1|univalue|leveldb)/)"
             ]
         },
         "lint-include-quotes": {
             "type": "lint-include-quotes",
             "include": "(^src/.*\\.(h|cpp)$)",
             "exclude": [
                 "(^src/(secp256k1|univalue|leveldb)/)"
             ]
         },
         "lint-include-guard": {
             "type": "lint-include-guard",
             "include": "(^src/.*\\.h$)",
             "exclude": [
                 "(^src/(crypto/ctaes|secp256k1|univalue|leveldb)/)",
                 "(^src/tinyformat.h$)"
             ]
         },
         "lint-include-source": {
             "type": "lint-include-source",
             "include": "(^src/.*\\.(h|c|cpp)$)",
             "exclude": [
                 "(^src/(secp256k1|univalue|leveldb)/)"
             ]
         },
         "lint-stdint": {
             "type": "lint-stdint",
             "include": "(^src/.*\\.(h|c|cpp)$)",
             "exclude": [
                 "(^src/(secp256k1|univalue|leveldb)/)"
             ]
         },
         "lint-source-filename": {
             "type": "lint-source-filename",
             "include": "(^src/.*\\.(h|c|cpp)$)",
             "exclude": [
                 "(^src/(secp256k1|univalue|leveldb)/)"
             ]
         },
         "lint-boost-dependencies": {
             "type": "lint-boost-dependencies",
             "include": "(^src/.*\\.(h|cpp)$)"
         },
         "check-rpc-mappings": {
             "type": "check-rpc-mappings",
             "include": "(^src/(rpc/|wallet/rpc).*\\.cpp$)"
         },
         "lint-python-encoding": {
             "type": "lint-python-encoding",
             "include": "(\\.py$)"
         }
     }
 }
diff --git a/arcanist/linter/ClangFormatLinter.php b/arcanist/linter/ClangFormatLinter.php
index efef327b7..bf05bae7c 100644
--- a/arcanist/linter/ClangFormatLinter.php
+++ b/arcanist/linter/ClangFormatLinter.php
@@ -1,89 +1,104 @@
 <?php
 
 /**
  * Uses the clang format to format C/C++/Obj-C code
  */
 final class ClangFormatLinter extends ArcanistExternalLinter {
 
   public function getInfoName() {
     return 'clang-format';
   }
 
   public function getInfoURI() {
     return '';
   }
 
   public function getInfoDescription() {
     return pht('Use clang-format for processing specified files.');
   }
 
   public function getLinterName() {
     return 'clang-format';
   }
 
   public function getLinterConfigurationName() {
     return 'clang-format';
   }
 
   public function getLinterConfigurationOptions() {
     $options = array();
     return $options + parent::getLinterConfigurationOptions();
   }
 
   public function getDefaultBinary() {
     return 'clang-format';
   }
 
   public function getVersion() {
     list($stdout) = execx('%C -version', $this->getExecutableCommand());
 
     $matches = array();
     $regex = '/^clang-format version (?P<version>\d+\.\d+)\./';
     if (preg_match($regex, $stdout, $matches)) {
-      return $matches['version'];
+      $version = $matches['version'];
     } else {
       return false;
     }
+
+    /*
+     * FIXME: This is a hack to only allow for clang-format version 7.x.
+     * The .arclint `version` field only allow to filter versions using `=`,
+     * `>`, `<`, `>=` or `<=`. There is no facility to define that the required
+     * version should be >= 7.0 and < 8.0.
+     */
+    if ($version[0] != '7') {
+      throw new Exception(pht('Linter %s requires clang-format version 7.x. '.
+                              'You have version %s.',
+                              ClangFormatLinter::class,
+                              $version));
+    }
+
+    return $version;
   }
 
   public function getInstallInstructions() {
     return pht('Make sure clang-format is in directory specified by $PATH');
   }
 
   public function shouldExpectCommandErrors() {
     return false;
   }
 
   protected function getMandatoryFlags() {
     return array();
   }
 
   protected function parseLinterOutput($path, $err, $stdout, $stderr) {
     $ok = ($err == 0);
 
     if (!$ok) {
       return false;
     }
 
     $root = $this->getProjectRoot();
     $path = Filesystem::resolvePath($path, $root);
     $orig = file_get_contents($path);
     if ($orig == $stdout) {
       return array();
     }
 
     $message = id(new ArcanistLintMessage())
       ->setPath($path)
       ->setLine(1)
       ->setChar(1)
       ->setGranularity(ArcanistLinter::GRANULARITY_FILE)
       ->setCode('CFMT')
       ->setSeverity(ArcanistLintSeverity::SEVERITY_AUTOFIX)
       ->setName('Code style violation')
       ->setDescription("'$path' has code style errors.")
       ->setOriginalText($orig)
       ->setReplacementText($stdout);
 
     return array($message);
   }
 }
diff --git a/arcanist/phpcs.xml b/arcanist/phpcs.xml
index c9459f739..7ab58aa5f 100644
--- a/arcanist/phpcs.xml
+++ b/arcanist/phpcs.xml
@@ -1,57 +1,59 @@
 <?xml version="1.0"?>
 <ruleset name="BitcoinABC Standard" namespace="BitcoinABC\CS\Standard">
 
     <description>
         BitcoinABC PHP coding standard.
     </description>
 
     <rule ref="Generic">
         <exclude name="Generic.Arrays.ArrayIndent" />
         <exclude name="Generic.Arrays.DisallowLongArraySyntax.Found" />
         <exclude name="Generic.Arrays.DisallowShortArraySyntax.Found" />
         <exclude name="Generic.CodeAnalysis.AssignmentInCondition.Found" />
         <exclude name="Generic.CodeAnalysis.UnusedFunctionParameter.Found" />
         <exclude name="Generic.CodeAnalysis.UnusedFunctionParameter.FoundInExtendedClassAfterLastUsed" />
         <exclude name="Generic.CodeAnalysis.UnusedFunctionParameter.FoundInExtendedClassBeforeLastUsed" />
         <exclude name="Generic.Commenting.DocComment.NonParamGroup" />
         <exclude name="Generic.Commenting.DocComment.ParamNotFirst" />
         <exclude name="Generic.Commenting.DocComment.SpacingBeforeTags" />
         <exclude name="Generic.Commenting.DocComment.TagValueIndent" />
+        <exclude name="Generic.Commenting.Fixme.TaskFound" />
+        <exclude name="Generic.Commenting.Todo.TaskFound" />
         <exclude name="Generic.Files.EndFileNoNewline.Found" />
         <exclude name="Generic.Files.LowercasedFilename" />
         <exclude name="Generic.Formatting.MultipleStatementAlignment" />
         <exclude name="Generic.Formatting.SpaceAfterCast.NoSpace" />
         <exclude name="Generic.Formatting.SpaceAfterNot" />
         <exclude name="Generic.Functions.OpeningFunctionBraceBsdAllman" />
         <exclude name="Generic.Metrics.CyclomaticComplexity.TooHigh" />
         <exclude name="Generic.PHP.ClosingPHPTag" />
         <exclude name="Generic.PHP.UpperCaseConstant" />
         <exclude name="Generic.WhiteSpace.DisallowSpaceIndent" />
     </rule>
 
     <rule ref="Generic.NamingConventions.CamelCapsFunctionName">
         <properties>
             <property name="strict" value="false" />
         </properties>
     </rule>
 
     <rule ref="Generic.Strings.UnnecessaryStringConcat">
         <properties>
             <property name="allowMultiline" value="true" />
         </properties>
     </rule>
 
     <rule ref="Generic.WhiteSpace.ScopeIndent">
         <properties>
             <property name="indent" value="2" />
             <property name="exact" value="true" />
             <property name="ignoreIndentationTokens" type="array"
                 value="T_COMMENT, T_OBJECT_OPERATOR" />
         </properties>
     </rule>
 
     <rule ref="PSR2.Files.ClosingTag" />
 
     <rule ref="Squiz.WhiteSpace.SuperfluousWhitespace" />
 
 </ruleset>