diff --git a/.clang-format b/.clang-format
index 547df6a95..63d884a09 100644
--- a/.clang-format
+++ b/.clang-format
@@ -1,7 +1,17 @@
 BasedOnStyle: LLVM
 IndentWidth: 8
 UseTab: Always
-BreakBeforeBraces: Linux
+BreakBeforeBraces: Custom
+BraceWrapping:
+  AfterClass: true
+  AfterControlStatement: false
+  AfterEnum: true
+  AfterFunction: true
+  AfterNamespace: true
+  AfterStruct: true
+  AfterUnion: true
+  BeforeCatch: false
+  BeforeElse: false
 AllowShortIfStatementsOnASingleLine: false
 IndentCaseLabels: false
 AccessModifierOffset: -8