diff --git a/.clang-format b/.clang-format
index fe2521d284..1d27824df1 100644
--- a/.clang-format
+++ b/.clang-format
@@ -15,9 +15,11 @@ AlignConsecutiveBitFields: AcrossComments
 AlignConsecutiveMacros: AcrossComments
 AlignEscapedNewlines: Left
 
+AllowAllArgumentsOnNextLine: false
 AllowAllParametersOfDeclarationOnNextLine: false
 AlwaysBreakAfterReturnType: AllDefinitions
-BinPackParameters: false
+BinPackArguments: true
+BinPackParameters: AlwaysOnePerLine
 BreakBeforeBinaryOperators: None
 BreakBeforeBraces: GNU
 BreakBeforeTernaryOperators: false