diff --git a/style/cpp/.clang-format b/style/cpp/.clang-format
index ba9f48d..edcf98e 100644
--- a/style/cpp/.clang-format
+++ b/style/cpp/.clang-format
@@ -85,12 +85,14 @@
 ObjCBlockIndentWidth: 2
 ObjCSpaceAfterProperty: false
 ObjCSpaceBeforeProtocolList: true
+PenaltyBreakAssignment: 25
 PenaltyBreakBeforeFirstCallParameter: 19
 PenaltyBreakComment: 300
 PenaltyBreakFirstLessLess: 120
 PenaltyBreakString: 1000
 PenaltyExcessCharacter: 1000000
 PenaltyReturnTypeOnItsOwnLine: 60
+PenaltyIndentedWhitespace: 0
 ReflowComments:  true
 SortIncludes:    true
 SortUsingDeclarations: true