diff --git a/.clang-format b/.clang-format
index 6460f166..48c84e6d 100644
--- a/.clang-format
+++ b/.clang-format
@@ -20,7 +20,7 @@ BraceWrapping:
 BinPackArguments: 'true'
 BinPackParameters: 'true'
 BreakBeforeBraces: 'WebKit'
-ColumnLimit: '0'
+ColumnLimit: '90'
 Cpp11BracedListStyle: 'true'
 DerivePointerAlignment: 'false'
 IndentCaseLabels: 'false'
diff --git a/.editorconfig b/.editorconfig
index 28ae07e7..824f4061 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -16,7 +16,7 @@ trim_trailing_whitespace    = true
 [*.{cc,cpp,hh,hpp}]
 indent_style                = tab
 indent_size                 = 8
-max_line_length             = 100
+max_line_length             = 90
 
 [*.{c,h}]
 indent_style                = tab