diff --git a/.arclint b/.arclint
new file mode 100644
index 000000000..50876d186
--- /dev/null
+++ b/.arclint
@@ -0,0 +1,23 @@
+{
+ "linters": {
+ "format": {
+ "type": "clang-format",
+ "include": [ "(\\.cc$)", "(\\.hh$)" ],
+ "exclude": "(^third-party/)"
+ },
+ "python": {
+ "type": "flake8",
+ "include": [ "(\\.py$)" ],
+ "exclude": "(^third-party/)",
+ "severity.rules": {
+ "(^E)": "error",
+ "(^W)": "warning",
+ "(^F)": "advice"
+ }
+ },
+
+ "merges": {
+ "type": "merge-conflict"
+ }
+ }
+}
diff --git a/.linters/clang-format-linter/.arclint b/.linters/clang-format-linter/.arclint
new file mode 100644
index 000000000..423ba8c54
--- /dev/null
+++ b/.linters/clang-format-linter/.arclint
@@ -0,0 +1,22 @@
+{
+ "linters": {
+ "text": {
+ "type": "text"
+ },
+ "merges": {
+ "type": "merge-conflict"
+ },
+ "phutil-library": {
+ "type": "phutil-library",
+ "include": "(\\.php$)"
+ },
+ "phutil-xhpast": {
+ "type": "phutil-xhpast",
+ "include": "(\\.php$)"
+ },
+ "xhpast": {
+ "type": "xhpast",
+ "include": "(\\.php$)"
+ }
+ }
+}
diff --git a/.linters/clang-format-linter/.gitignore b/.linters/clang-format-linter/.gitignore
new file mode 100644
index 000000000..6b193c3e1
--- /dev/null
+++ b/.linters/clang-format-linter/.gitignore
@@ -0,0 +1 @@
+.phutil_module_cache
diff --git a/.linters/clang-format-linter/LICENSE b/.linters/clang-format-linter/LICENSE
new file mode 100644
index 000000000..484847f78
--- /dev/null
+++ b/.linters/clang-format-linter/LICENSE
@@ -0,0 +1,28 @@
+Copyright (c) 2015, Valerii Hiora
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+
+* Neither the name of clang-format-linter nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
diff --git a/.linters/clang-format-linter/README.md b/.linters/clang-format-linter/README.md
new file mode 100644
index 000000000..eef39447d
--- /dev/null
+++ b/.linters/clang-format-linter/README.md
@@ -0,0 +1,113 @@
+# clang-format-linter
+
+Tired of spending half time of code review on marking code style
+issues?
+
+Here we go - this allows to use `clang-format` as a linter for
+[arcanist](https://phacility.com/phabricator/arcanist) to enforce style over
+your C/C++/Objective-C codebase.
+
+It's not invasive (yet) and at the moment just suggests to autofix
+code.
+
+## Installation
+
+What you want to get is to make this module to be available for
+`arcanist`. There are a couple of ways to achieve it depending on your
+requirements.
+
+### Prerequisites
+
+Right now `clang-format` should be installed beforehand. On OS X you
+can do it through [homebrew](https://brew.sh) `brew install
+clang-format`.
+
+You also have to configure your style in `.clang-format`
+([documentation](http://clang.llvm.org/docs/ClangFormatStyleOptions.html))
+
+Best way is to start from a predefined style by dumping an existing
+style `clang-format -style=LLVM -dump-config > .clang-format` and tune
+parameters.
+
+There is also a wonderful
+[interactive builder](http://clangformat.com/) available.
+
+### Project-specific installation
+
+You can add this repository as a git submodule and in this case
+`.arcconfig` should look like:
+
+```json
+{
+ "load": [
+ "path/to/submodule"
+ ]
+ // ...
+}
+```
+
+### Global installation
+`arcanist` can load modules from an absolute path. But there is one
+more trick - it also searches for modules in a directory up one level
+from itself.
+
+It means that you can clone this repository to the same directory
+where `arcanist` and `libphutil` are located. In the end it should
+look like this:
+
+```sh
+> ls
+arcanist
+clang-format-linter
+libphutil
+```
+
+In this case you `.arcconfig` should look like
+
+```json
+{
+ "load": [
+ "clang-format-linter"
+ ]
+ // ...
+}
+```
+
+Another approach is to clone `clang-format-linter` to a fixed location
+and use absolute path like:
+
+```sh
+cd ~/.dev-tools
+git clone https://github.com/vhbit/clang-format-linter
+```
+
+```json
+{
+ "load": [
+ "~/.dev-tools/clang-format-linter"
+ ]
+ // ...
+}
+```
+
+Both ways of global installation are actually almost equally as in
+most cases you'd like to have a bootstrapping script for all tools.
+
+## Setup
+
+Once installed, linter can be used and configured just as any other
+`arcanist linter`
+
+Here is a simplest `.arclint`:
+
+```json
+{
+ "linters": {
+ "clang-format": {
+ "type": "clang-format",
+ "include": "(^Source/.*\\.(m|h|mm)$)"
+ },
+ // ...
+ }
+}
+```
diff --git a/.linters/clang-format-linter/__phutil_library_init__.php b/.linters/clang-format-linter/__phutil_library_init__.php
new file mode 100644
index 000000000..41b2534a5
--- /dev/null
+++ b/.linters/clang-format-linter/__phutil_library_init__.php
@@ -0,0 +1,3 @@
+<?php
+
+phutil_register_library('objc-format-linter', __FILE__);
diff --git a/.linters/clang-format-linter/__phutil_library_map__.php b/.linters/clang-format-linter/__phutil_library_map__.php
new file mode 100644
index 000000000..34939da8a
--- /dev/null
+++ b/.linters/clang-format-linter/__phutil_library_map__.php
@@ -0,0 +1,18 @@
+<?php
+
+/**
+ * This file is automatically generated. Use 'arc liberate' to rebuild it.
+ *
+ * @generated
+ * @phutil-library-version 2
+ */
+phutil_register_library_map(array(
+ '__library_version__' => 2,
+ 'class' => array(
+ 'ClangFormatLinter' => 'lint/linter/ClangFormatLinter.php',
+ ),
+ 'function' => array(),
+ 'xmap' => array(
+ 'ClangFormatLinter' => 'ArcanistExternalLinter',
+ ),
+));
diff --git a/.linters/clang-format-linter/lint/linter/ClangFormatLinter.php b/.linters/clang-format-linter/lint/linter/ClangFormatLinter.php
new file mode 100644
index 000000000..c1bf34850
--- /dev/null
+++ b/.linters/clang-format-linter/lint/linter/ClangFormatLinter.php
@@ -0,0 +1,88 @@
+<?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 'https://clang.llvm.org/docs/ClangFormat.html';
+ }
+
+ 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();
+ if (preg_match('/^(?P<version>\d+\.\d+\.\d+)$/', $stdout, $matches)) {
+ return $matches['version'];
+ } else {
+ return false;
+ }
+ }
+
+ public function getInstallInstructions() {
+ return pht('On a apt based system, apt-get install clang-format. Othewhy install following the instructions on installing tool inb clang, and 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);
+ }
+}