diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000000..e5e7e30ed8
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,10 @@
+root = true
+
+[*]
+charset = utf-8
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[{CMakeLists.txt,*.cmake,*.rst}]
+indent_size = 2
+indent_style = space
diff --git a/.gitattributes b/.gitattributes
index 3da2d60f54..fac38dfd74 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,5 +1,6 @@
 .git*            export-ignore
 .hooks*          export-ignore
+.editorconfig    export-ignore
 
 # Custom attribute to mark sources as using our C code style.
 [attr]our-c-style  whitespace=tab-in-indent  format.clang-format-6.0