diff --git a/.editorconfig b/.editorconfig
index beebdabe..f97052ce 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -3,11 +3,12 @@ root = true
 
 [*]
 charset = utf-8
-indent_style = space
+end_of_line = lf
 indent_size = 2
+indent_style = space
 insert_final_newline = true
-trim_trailing_whitespace = true
 quote_type=single
+trim_trailing_whitespace = true
 
 [*.md]
 max_line_length = off
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000..205021e4
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+# Enforce Unix newlines
+* text=auto eol=lf