diff --git a/.clang-format b/.clang-format
index 13efcc2dff..fe2521d284 100644
--- a/.clang-format
+++ b/.clang-format
@@ -9,15 +9,18 @@ BasedOnStyle: GNU
 
 AlignAfterOpenBracket: Align
 AlignArrayOfStructures: Left
-AlignConsecutiveAssignments: Consecutive
-AlignConsecutiveDeclarations: Consecutive
-AlignConsecutiveMacros: Consecutive
+AlignConsecutiveAssignments: AcrossComments
+AlignConsecutiveDeclarations: AcrossComments
+AlignConsecutiveBitFields: AcrossComments
+AlignConsecutiveMacros: AcrossComments
 AlignEscapedNewlines: Left
 
 AllowAllParametersOfDeclarationOnNextLine: false
 AlwaysBreakAfterReturnType: AllDefinitions
 BinPackParameters: false
+BreakBeforeBinaryOperators: None
 BreakBeforeBraces: GNU
+BreakBeforeTernaryOperators: false
 IndentWidth: 2
 PointerAlignment: Right
 UseTab: Never