diff --git a/.clang-format b/.clang-format
index 2f600e0c70..e571cd0373 100644
--- a/.clang-format
+++ b/.clang-format
@@ -19,8 +19,20 @@ AlwaysBreakBeforeMultilineStrings: false
 AlwaysBreakTemplateDeclarations: true
 BinPackArguments: true
 BinPackParameters: true
+BraceWrapping:
+  AfterClass:      true
+  AfterControlStatement: false
+  AfterEnum:       false
+  AfterFunction:   true
+  AfterNamespace:  true
+  AfterObjCDeclaration: false
+  AfterStruct:     true
+  AfterUnion:      true
+  BeforeCatch:     false
+  BeforeElse:      false
+  IndentBraces:    false
 BreakBeforeBinaryOperators: None
-BreakBeforeBraces: Linux
+BreakBeforeBraces: Custom
 BreakBeforeTernaryOperators: false
 BreakConstructorInitializersBeforeComma: true
 ColumnLimit:     0
diff --git a/linux_various/check_format.sh b/linux_various/check_format.sh
index 0dc9e54df8..bbe6433cb1 100755
--- a/linux_various/check_format.sh
+++ b/linux_various/check_format.sh
@@ -45,7 +45,7 @@ files=`git diff $diff_range --name-only --diff-filter=ACMRT | \
     grep -v "${1}plugins/zzogl-pg/" | \
     \
     grep -v "/resource.h" | \
-    grep -v "3rdpary/" | \
+    grep -v "3rdparty/" | \
     grep -v "bin/" | \
     grep -v "cmake/" | \
     grep -v "tools/" | \