diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 00000000..c7a5f17e
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,21 @@
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+tab_width = 8
+end_of_line = lf
+spelling_language = en-US
+
+[*.md]
+# I would use 2 spaces for indentation in Markdown files in order to be
+# consistent wit the rest of the project, but the GitHub Flavored Markdown Spec
+# requires that you use at least 4 spaces in certain situations:
+# <https://github.github.com/gfm/#indented-code-blocks>
+indent_size = 4
+
+# This end_of_line override exists in order to be consistent with
+# .gitattributes. If you add another override here, then you please also add it
+# to .gitattributes.
+[{*.vcproj,*.vcxproj}]
+end_of_line = crlf
diff --git a/.gitattributes b/.gitattributes
index 560539ad..aa1783a6 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -32,6 +32,8 @@
 *.yaml text eol=lf
 *.yml text eol=lf
 
+# .editorconfig also contains a list of files that should use CRLFs. If you add
+# a new “eol=crlf” here, then please also add it to .editorconfig.
 # Visual Studio project files
 *.vcproj text eol=crlf
 *.vcxproj text eol=crlf