diff --git a/.editorconfig b/.editorconfig
index 94054d769e4..b4996a80cde 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -6,5 +6,8 @@ insert_final_newline = true
 vc_generate_documentation_comments = doxygen_slash_star
 end_of_line = lf
 
+[*.bat]
+end_of_line = crlf
+
 [*.lingo]
 charset = macroman
diff --git a/.gitattributes b/.gitattributes
index 198366cb20d..b71c8fd4d87 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,6 +1,7 @@
 /po/*.po encoding=utf-8
 *.lingo	encoding=MacRoman
 /engines.awk eol=lf
+*.bat text eol=crlf
 *.cpp text eol=lf
 *.h text eol=lf
 *.hpp text eol=lf