diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 00000000..61afff91
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,9 @@
+# EditorConfig is awesome: http://EditorConfig.org
+# top-most EditorConfig file
+# Unix-style newlines with a newline ending every file
+[*]
+end_of_line = lf
+insert_final_newline = true
+indent_style = space
+indent_size = 2
+trim_trailing_whitespace=true
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 1dc5604c..d2c056fb 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -3,6 +3,8 @@ Pull Requests are happily accepted, provided that you add or update QUnit tests
 ## Development
 
 Please set your editors to use spaces, rather than tabs, (2 spaces per tab) and trim empty lines if possible.
+We have included an [EditorConfig](http://editorconfig.org/) file in the repository so you can configure
+your favourite editor to use this.
 
 If you want to run your tests, or open the ./tests/index.html page, or: