diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 65465704..28d1cb48 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -36,6 +36,8 @@ phutil_register_library_map(array(
     'ArcanistConduitLinter' => 'lint/linter/ArcanistConduitLinter.php',
     'ArcanistConfiguration' => 'configuration/ArcanistConfiguration.php',
     'ArcanistCoverWorkflow' => 'workflow/ArcanistCoverWorkflow.php',
+    'ArcanistCpplintLinter' => 'lint/linter/ArcanistCpplintLinter.php',
+    'ArcanistCpplintLinterTestCase' => 'lint/linter/__tests__/ArcanistCpplintLinterTestCase.php',
     'ArcanistDiffChange' => 'parser/diff/ArcanistDiffChange.php',
     'ArcanistDiffChangeType' => 'parser/diff/ArcanistDiffChangeType.php',
     'ArcanistDiffHunk' => 'parser/diff/ArcanistDiffHunk.php',
@@ -174,6 +176,8 @@ phutil_register_library_map(array(
     'ArcanistCommitWorkflow' => 'ArcanistBaseWorkflow',
     'ArcanistConduitLinter' => 'ArcanistLinter',
     'ArcanistCoverWorkflow' => 'ArcanistBaseWorkflow',
+    'ArcanistCpplintLinter' => 'ArcanistLinter',
+    'ArcanistCpplintLinterTestCase' => 'ArcanistArcanistLinterTestCase',
     'ArcanistDiffParserTestCase' => 'ArcanistTestCase',
     'ArcanistDiffUtilsTestCase' => 'ArcanistTestCase',
     'ArcanistDiffWorkflow' => 'ArcanistBaseWorkflow',
diff --git a/src/lint/linter/ArcanistCpplintLinter.php b/src/lint/linter/ArcanistCpplintLinter.php
new file mode 100644
index 00000000..e2d3f137
--- /dev/null
+++ b/src/lint/linter/ArcanistCpplintLinter.php
@@ -0,0 +1,105 @@
+<?php
+
+/**
+ * Uses google's cpplint.py to check code.
+ *
+ * You can get it here:
+ * http://google-styleguide.googlecode.com/svn/trunk/cpplint/cpplint.py
+ * @group linter
+ */
+final class ArcanistCpplintLinter extends ArcanistLinter {
+
+  public function willLintPaths(array $paths) {
+    return;
+  }
+
+  public function getLinterName() {
+    return 'cpplint.py';
+  }
+
+  public function getLintOptions() {
+    $working_copy = $this->getEngine()->getWorkingCopy();
+    $options = $working_copy->getConfig('lint.cpplint.options', '');
+
+    return $options;
+  }
+
+  public function getLintPath() {
+    $working_copy = $this->getEngine()->getWorkingCopy();
+    $prefix = $working_copy->getConfig('lint.cpplint.prefix');
+    $bin = $working_copy->getConfig('lint.cpplint.bin');
+
+    if ($bin === null && $prefix === null) {
+      $bin = 'cpplint.py';
+    } else {
+      if ($bin === null) {
+        $bin = 'cpplint.py';
+      }
+
+      if ($prefix !== null) {
+        if (!Filesystem::pathExists($prefix.'/'.$bin)) {
+          throw new ArcanistUsageException(
+            "Unable to find cpplint.py binary in a specified directory. Make ".
+            "sure that 'lint.cpplint.prefix' and 'lint.cpplint.bin' keys are ".
+            "set correctly. If you'd rather use a copy of cpplint installed ".
+            "globally, you can just remove these keys from your .arcconfig");
+        }
+
+        $bin = csprintf("%s/%s", $prefix, $bin);
+
+        return $bin;
+      }
+
+      // Look for globally installed cpplint.py
+      list($err) = exec_manual('which %s', $bin);
+      if ($err) {
+        throw new ArcanistUsageException(
+          "cpplint.py does not appear to be installed on this system. Install".
+          "it (e.g., with 'wget \"http://google-styleguide.googlecode.com/".
+          "svn/trunk/cpplint/cpplint.py\"') or configure 'lint.cpplint.prefix'".
+          "in your .arcconfig to point to the directory where it resides.  ".
+          "Also don't forget to chmod a+x cpplint.py!");
+      }
+    }
+
+    return $bin;
+
+  }
+
+  public function lintPath($path) {
+    $bin = $this->getLintPath();
+    $options = $this->getLintOptions();
+
+    $f = new ExecFuture("%C %C -", $bin, $options);
+    $f->write($this->getData($path));
+
+    list($err, $stdout, $stderr) = $f->resolve();
+
+    if ($err === 2) {
+      throw new Exception("cpplint failed to run correctly:\n".$stderr);
+    }
+
+    $lines = explode("\n", $stderr);
+    $messages = array();
+    foreach ($lines as $line) {
+      $line = trim($line);
+      $matches = null;
+      $regex = '/^-:(\d+):\s*(.*)\s*\[(.*)\] \[(\d+)\]$/';
+      if (!preg_match($regex, $line, $matches)) {
+        continue;
+      }
+      foreach ($matches as $key => $match) {
+        $matches[$key] = trim($match);
+      }
+      $message = new ArcanistLintMessage();
+      $message->setPath($path);
+      $message->setLine($matches[1]);
+      $message->setCode($matches[3]);
+      $message->setName($matches[3]);
+      $message->setDescription($matches[2]);
+      $message->setSeverity(ArcanistLintSeverity::SEVERITY_WARNING);
+      $this->addLintMessage($message);
+    }
+  }
+
+}
diff --git a/src/lint/linter/__tests__/ArcanistCpplintLinterTestCase.php b/src/lint/linter/__tests__/ArcanistCpplintLinterTestCase.php
new file mode 100644
index 00000000..acef3f62
--- /dev/null
+++ b/src/lint/linter/__tests__/ArcanistCpplintLinterTestCase.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * Test cases for @{class:ArcanistCpplintLinter}.
+ *
+ * @group testcase
+ */
+final class ArcanistCpplintLinterTestCase
+  extends ArcanistArcanistLinterTestCase {
+
+  public function testCpplintLint() {
+    $linter = new ArcanistCpplintLinter();
+    $working_copy = ArcanistWorkingCopyIdentity::newFromPath(__FILE__);
+    return $this->executeTestsInDirectory(
+      dirname(__FILE__).'/cpp/',
+      $linter,
+      $working_copy);
+  }
+
+}
diff --git a/src/lint/linter/__tests__/cpp/googlestyle.lint-test b/src/lint/linter/__tests__/cpp/googlestyle.lint-test
new file mode 100644
index 00000000..5417f073
--- /dev/null
+++ b/src/lint/linter/__tests__/cpp/googlestyle.lint-test
@@ -0,0 +1,10 @@
+#include "library.cpp"
+#include <stdio>
+
+void main()
+{
+}
+~~~~~~~~~~
+warning:0:
+warning:2:
+warning:5: