diff --git a/.arclint b/.arclint
index df31245a1..9ca590a83 100644
--- a/.arclint
+++ b/.arclint
@@ -1,55 +1,56 @@
 {
     "linters": {
         "generated": {
             "type": "generated"
         },
         "clang-format": {
             "type": "clang-format",
             "version": "7.0",
             "bin": ["clang-format-7", "clang-format"],
             "include": "(^src/.*\\.(h|c|cpp)$)",
             "exclude": [
                 "(^src/(secp256k1|univalue|leveldb)/)"
             ]
         },
         "autopep8": {
             "type": "autopep8",
+            "version": ">=1.3.4",
             "include": "(\\.py$)"
         },
         "flake8": {
             "type": "flake8",
             "include": "(\\.py$)",
             "flags": [
                 "--select=F401,F403,F405"
             ]
         },
         "lint-format-strings": {
             "type": "script-and-regex",
             "include": "(^src/.*\\.(h|c|cpp)$)",
             "exclude": [
                 "(^src/(secp256k1|univalue|leveldb)/)"
             ],
             "script-and-regex.script": "test/lint/lint-format-strings.sh",
             "script-and-regex.regex": "/^(?P<file>.+): (?P<message>.+:.+)$/m"
         },
         "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$)"
             ]
         },
         "lint-locale-dependence": {
             "type": "lint-locale-dependence",
             "include": "(^src/.*\\.(h|cpp)$)"
         }
     }
 }
diff --git a/arcanist/linter/AutoPEP8Linter.php b/arcanist/linter/AutoPEP8Linter.php
index 2bd0032ce..4a6dbcc83 100644
--- a/arcanist/linter/AutoPEP8Linter.php
+++ b/arcanist/linter/AutoPEP8Linter.php
@@ -1,79 +1,102 @@
 <?php
 
 /**
  * Uses the autopep8 tool to format python code
  */
 final class AutoPEP8FormatLinter extends ArcanistExternalLinter {
 
   public function getInfoName() {
     return 'autopep8';
   }
 
   public function getInfoURI() {
     return '';
   }
 
   public function getInfoDescription() {
     return pht('Use autopep8 for processing specified files.');
   }
 
   public function getLinterName() {
     return 'autopep8';
   }
 
   public function getLinterConfigurationName() {
     return 'autopep8';
   }
 
   public function getLinterConfigurationOptions() {
     $options = array(
     );
 
     return $options + parent::getLinterConfigurationOptions();
   }
 
   public function getDefaultBinary() {
     return 'autopep8';
   }
+  
+  public function getVersion() {
+    list($stdout, $stderr) = execx('%C --version',
+      $this->getExecutableCommand());
+    $matches = array();
+    
+    /* Support a.b or a.b.c version numbering scheme */
+    $regex = '/^autopep8 (?P<version>\d+\.\d+(?:\.\d+)?)/';
+    
+    /* 
+     * Old autopep8 output the version to stdout, newer output to stderr.
+     * Try both to determine the version.
+     */
+    if (preg_match($regex, $stdout, $matches)) {
+      return $matches['version'];
+    } 
+    if (preg_match($regex, $stderr, $matches)) {
+      return $matches['version'];
+    }
+
+    return false;
+  }
+  
 
   public function getInstallInstructions() {
     return pht('Make sure autopep8 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);
   }
 }