diff --git a/.clang-format b/.clang-format
index 70db1f73fd9..fcd7ce48579 100644
--- a/.clang-format
+++ b/.clang-format
@@ -159,6 +159,8 @@ StatementMacros:
 TabWidth:        4
 UseCRLF:         false
 UseTab:          Never
+InsertNewlineAtEOF: true
+KeepEmptyLinesAtEOF: true
 WhitespaceSensitiveMacros:
   - STRINGIZE
   - PP_STRINGIZE