diff --git a/.gitattributes b/.gitattributes
index 2d3321e3c..00fc25017 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -24,6 +24,7 @@
 /pylint*                      recipes
 /repo                         recipes
 /roll-dep*                    recipes
+/yapf*                        recipes
 
 # Symlinks
 /cbuildbot      recipes
diff --git a/yapf b/yapf
new file mode 100755
index 000000000..a1e5b1a72
--- /dev/null
+++ b/yapf
@@ -0,0 +1,17 @@
+#!/usr/bin/env vpython
+
+# [VPYTHON:BEGIN]
+# wheel: <
+#   name: "infra/python/wheels/yapf-py2_py3"
+#   version: "version:0.22.0"
+# >
+# [VPYTHON:END]
+
+# -*- coding: utf-8 -*-
+import re
+import sys
+
+from yapf import run_main
+
+if __name__ == '__main__':
+    sys.exit(run_main())
diff --git a/yapf.bat b/yapf.bat
new file mode 100755
index 000000000..06390ffcf
--- /dev/null
+++ b/yapf.bat
@@ -0,0 +1,12 @@
+@echo off
+:: Copyright (c) 2015 The Chromium Authors. All rights reserved.
+:: Use of this source code is governed by a BSD-style license that can be
+:: found in the LICENSE file.
+setlocal
+
+:: Ensure that "depot_tools" is somewhere in PATH so this tool can be used
+:: standalone, but allow other PATH manipulations to take priority.
+set PATH=%PATH%;%~dp0
+
+:: Defer control.
+python "%~dp0\yapf" %*