diff --git a/.editorconfig b/.editorconfig
index e19057f0e83..b7ef43c3401 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -5,6 +5,9 @@ charset = utf-8
 end_of_line = lf
 indent_style = tab
 
+[*.{cpp,hpp,c,h,mm}]
+trim_trailing_whitespace = true
+
 [.travis.yml]
 indent_style = space
 indent_size = 2