diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 000000000..ad6ac1f5c
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,7 @@
+# Settings in .editorconfig should match checkstyle config
+
+root = true
+
+[*]
+charset = utf-8
+max_line_length = 120