diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 00000000000..5e3cc84e1ff
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,2 @@
+[*.{ql,qll,qlref,dbscheme,}]
+end_of_line = lf
diff --git a/.gitattributes b/.gitattributes
index 21bbc40553d..04a0ee05cf8 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,13 +1,15 @@
 # The following file types will be normalized to LF line endings in the Git
 # database, and will keep those LF line endings in the working tree even on
 # Windows. Any other files will have whatever line endings they had when they
-# were committed. If you add new entires below, you should renormalize the
+# were committed. If you add new entries below, you should renormalize the
 # affected files by running the following from the root of this repo (requires
 # Git 2.16 or greater):
 #
 # git add --renormalize .
 # git status  [just to show what files were renormalized]
 # git commit -m "Normalize line endings"
+#
+# Also, please update .editorconfig to handle any new entries as well.
 *.ql eol=lf
 *.qll eol=lf
 *.qlref eol=lf