diff --git a/.editorconfig b/.editorconfig
index 8d595d7f0a4..94054d769e4 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -4,6 +4,7 @@ indent_size = 4
 trim_trailing_whitespace = true
 insert_final_newline = true
 vc_generate_documentation_comments = doxygen_slash_star
+end_of_line = lf
 
 [*.lingo]
 charset = macroman
diff --git a/.gitattributes b/.gitattributes
index 63a56d2c892..27cbf4d31b1 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,3 +1,6 @@
 /po/*.po encoding=utf-8
 *.lingo	encoding=MacRoman
 /engines.awk eol=lf
+*.cpp text eol=lf
+*.h text eol=lf
+*.hpp text eol=lf