diff --git a/app/.editorconfig b/app/.editorconfig
new file mode 100644
index 000000000..bd8c8987e
--- /dev/null
+++ b/app/.editorconfig
@@ -0,0 +1,16 @@
+# EditorConfig is awesome: http://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+# Unix-style newlines with a newline ending every file
+[*]
+end_of_line = lf
+insert_final_newline = true
+indent_style = space
+indent_size = 2
+charset = utf-8
+
+[*.{md,adoc}]
+indent_style = space
+trim_trailing_whitespace = false
diff --git a/arduino-core/.editorconfig b/arduino-core/.editorconfig
new file mode 100644
index 000000000..bd8c8987e
--- /dev/null
+++ b/arduino-core/.editorconfig
@@ -0,0 +1,16 @@
+# EditorConfig is awesome: http://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+# Unix-style newlines with a newline ending every file
+[*]
+end_of_line = lf
+insert_final_newline = true
+indent_style = space
+indent_size = 2
+charset = utf-8
+
+[*.{md,adoc}]
+indent_style = space
+trim_trailing_whitespace = false