diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 000000000..70ec21bbf
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,29 @@
+# https://editorconfig.org
+
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+indent_size = 4
+indent_style = tab
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.{vue,js}]
+indent_style = space
+indent_size = 4
+
+[*.yml]
+indent_size = 2
+indent_style = space
+
+[*.md]
+trim_trailing_whitespace = false
+
+[*.svg]
+insert_final_newline = false
+
+[package*.json]
+indent_size = 2
+indent_style = space
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ee51a1c42..bd31fb18e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -61,6 +61,8 @@
   [#1802](https://github.com/nextcloud/cookbook/pull/1802) @christianlupus
 - Update lint config
   [#1783](https://github.com/nextcloud/cookbook/pull/1783) @dependabot
+- Add editorconfig file for better cooperation
+  [#1771](https://github.com/nextcloud/cookbook/pull/1771) @SethFalco
 
 
 ## 0.10.2 - 2023-03-24