diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 000000000..b37058252
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,15 @@
+# http://editorconfig.org
+root = true
+
+[*]
+indent_style = tab
+indent_size = 8
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+# Use 2 spaces for meson files
+[*.build]
+indent_style = space
+indent_size = 2
diff --git a/src/gst/.editorconfig b/src/gst/.editorconfig
new file mode 100644
index 000000000..b6330b24d
--- /dev/null
+++ b/src/gst/.editorconfig
@@ -0,0 +1,7 @@
+[*]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true