diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 000000000..3a23aeb8d
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,19 @@
+# EditorConfig is awesome: https://EditorConfig.org
+root = true
+
+[*.java]
+indent_style = space
+indent_size = 4
+
+[*.fxml]
+indent_style = space
+indent_size = 2
+
+[*.yml]
+indent_style = space
+indent_size = 2
+
+[pom.xml]
+indent_style = space
+indent_size = 4
+
diff --git a/README.md b/README.md
index 4d6a02f60..6547ccf79 100644
--- a/README.md
+++ b/README.md
@@ -110,3 +110,4 @@ There will be a report for each sub-project, one for `app` and one for `kit`.
 * Kit: `kit/target/site/checkstyle.html`
 * App: `app/target/site/checkstyle.html`
 
+This project makes use of [EditorConfig](https://editorconfig.org/) which is [directly supported](https://editorconfig.org/#pre-installed) by IntelliJ IDEA. There are plugins for NetBeans, Eclipse and Visual Studio and [more](https://editorconfig.org/#download). EditorConfig ensures via configuration in `.editorconfig` file, that the proper indentation is used.
\ No newline at end of file