diff --git a/.clang-format b/.clang-format
index 18b873c5bb..11a44d587c 100644
--- a/.clang-format
+++ b/.clang-format
@@ -6,5 +6,16 @@ Language: Java
 BasedOnStyle: Google
 ---
 Language: ObjC
-ColumnLimit: 100
 BasedOnStyle: Google
+BinPackParameters: false
+BinPackArguments: false
+ColumnLimit: 100
+ObjCBlockIndentWidth: 2
+AllowAllParametersOfDeclarationOnNextLine: true
+AlignOperands: false
+AlwaysBreakBeforeMultilineStrings: false
+AllowShortFunctionsOnASingleLine: Inline
+BreakBeforeTernaryOperators: false
+IndentWrappedFunctionNames: true
+ContinuationIndentWidth: 4
+ObjCSpaceBeforeProtocolList: true