diff --git a/.clang-format b/.clang-format
index 5d6deb9871..7bd90052ab 100644
--- a/.clang-format
+++ b/.clang-format
@@ -80,3 +80,4 @@ Standard: Cpp11
 ContinuationIndentWidth: 8
 ForEachMacros: [ 'cds_lfs_for_each', 'cds_lfs_for_each_safe', 'cds_list_for_each_entry_safe', 'ISC_LIST_FOREACH', 'ISC_LIST_FOREACH_SAFE', 'ISC_LIST_FOREACH_REV', 'ISC_LIST_FOREACH_REV_SAFE' ]
 RemoveParentheses: ReturnStatement
+RemoveSemicolon: true
diff --git a/.clang-format.headers b/.clang-format.headers
index 0f8ff5ac80..f5a5bae64e 100644
--- a/.clang-format.headers
+++ b/.clang-format.headers
@@ -79,3 +79,4 @@ PenaltyExcessCharacter: 100
 Standard: Cpp11
 ContinuationIndentWidth: 8
 RemoveParentheses: ReturnStatement
+RemoveSemicolon: true