diff --git a/.editorconfig b/.editorconfig
index 6e87a003d..0301b00a8 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -7,6 +7,7 @@ indent_style = space
 indent_size = 2
 insert_final_newline = true
 trim_trailing_whitespace = true
+end_of_line = lf
 
 [*.md]
 max_line_length = off
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000000000..9b9e66c39
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,3 @@
+* text eol=lf
+*.png binary
+*.ico binary