diff --git a/.clang-format b/.clang-format
index a88aaa117..9676b02c3 100644
--- a/.clang-format
+++ b/.clang-format
@@ -12,8 +12,12 @@ AlignOperands: true
 SortIncludes: false
 UseTab: ForContinuationAndIndentation
 AllowShortFunctionsOnASingleLine: Empty
+ReflowComments: true
+PenaltyBreakComment: 500
 ---
 BasedOnStyle: Mozilla
 Language: Java
 ColumnLimit: 120
 IndentWidth: 8
+ReflowComments: true
+PenaltyBreakComment: 500