diff --git a/.style.yapf b/.style.yapf
new file mode 100644
index 00000000..b4973712
--- /dev/null
+++ b/.style.yapf
@@ -0,0 +1,6 @@
+[style]
+based_on_style = pep8
+split_before_expression_after_opening_paren = True
+split_before_first_argument = True
+split_complex_comprehension = True
+split_penalty_comprehension = 2100
diff --git a/Makefile b/Makefile
index b5b0e459..c34ebed6 100644
--- a/Makefile
+++ b/Makefile
@@ -10,4 +10,4 @@ go:
 format:
 	find . -name \*.cc -and -not -path './third_party/*' -exec $(CLANG_FORMAT) -style=file -i {} \;
 	find . -name \*.h -and -not -path './third_party/*' -exec $(CLANG_FORMAT) -style=file -i {} \;
-	find . -name \*.py -and -not -path './third_party/*' -exec autopep8 -i {} \;
+	find . -name \*.py -and -not -path './third_party/*' -exec yapf -p -i {} \;
diff --git a/requirements.txt b/requirements.txt
index d81c0c25..612ba388 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1 +1,2 @@
-autopep8
+yapf
+futures