diff --git a/.clang-format b/.clang-format
index 847895e7ac..088f02cd93 100644
--- a/.clang-format
+++ b/.clang-format
@@ -38,7 +38,7 @@ BreakBeforeTernaryOperators: true
 BreakConstructorInitializersBeforeComma: false
 # clang-format > v3.8.0: BreakAfterJavaFieldAnnotations: false
 # clang-format > v3.8.0: BreakStringLiterals: true
-ColumnLimit:     0
+ColumnLimit:     135
 CommentPragmas:  '^ IWYU pragma:'
 ConstructorInitializerAllOnOneLineOrOnePerLine: false
 ConstructorInitializerIndentWidth: 4