diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000000..d705825574
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,25 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright 2019 6WIND S.A.
+# See https://editorconfig.org/ for syntax reference.
+
+root = true
+
+[*]
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+charset = utf-8
+indent_style = tab
+tab_width = 8
+max_line_length = 80
+
+[*.py]
+indent_style = space
+indent_size = 4
+
+[*.rst]
+indent_style = space
+indent_size = 3
+
+[COMMIT_EDITMSG]
+max_line_length = 72
diff --git a/MAINTAINERS b/MAINTAINERS
index b41252fb8c..1886b18c38 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -104,6 +104,7 @@ F: devtools/load-devel-config
 F: devtools/test-build.sh
 F: devtools/test-meson-builds.sh
 F: license/
+F: .editorconfig
 
 
 Build System