diff --git a/Packages/.editorconfig b/Packages/.editorconfig
index a1a89b95..b9557124 100644
--- a/Packages/.editorconfig
+++ b/Packages/.editorconfig
@@ -4,7 +4,7 @@ root = true
 
 [*]
 # help with sharing files across os's (i.e. network share or through local vm)
-end_of_line = lf
+end_of_line = crlf
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
diff --git a/Packages/.gitattributes b/Packages/.gitattributes
index 1f8c6889..4d84d5a0 100644
--- a/Packages/.gitattributes
+++ b/Packages/.gitattributes
@@ -1,34 +1,34 @@
-* text=auto eol=lf
+* text=auto eol=crlf
 
 # EOL
 
-*.py eol=lf
-*.pl eol=lf
-*.pm eol=lf
-*.t eol=lf
-*.it eol=lf
-*.h eol=lf
-*.cpp eol=lf
-*.cs eol=lf
-*.c eol=lf
-*.txt eol=lf
-*.bindings eol=lf
-*.sh eol=lf
-*.jam eol=lf
-*.as eol=lf
-*.boo eol=lf
-*.java eol=lf
-*.js eol=lf
-Makefile eol=lf
-*.shader eol=lf
-*.cginc eol=lf
-*.glslinc eol=lf
-*.meta eol=lf
-*.mm eol=lf
-*.md eol=lf
-Runtime/Export/common_* eol=lf
-Repositories.ini eol=lf
-.hgignore eol=lf
+*.py eol=crlf
+*.pl eol=crlf
+*.pm eol=crlf
+*.t eol=crlf
+*.it eol=crlf
+*.h eol=crlf
+*.cpp eol=crlf
+*.cs eol=crlf
+*.c eol=crlf
+*.txt eol=crlf
+*.bindings eol=crlf
+*.sh eol=crlf
+*.jam eol=crlf
+*.as eol=crlf
+*.boo eol=crlf
+*.java eol=crlf
+*.js eol=crlf
+Makefile eol=crlf
+*.shader eol=crlf
+*.cginc eol=crlf
+*.glslinc eol=crlf
+*.meta eol=crlf
+*.mm eol=crlf
+*.md eol=crlf
+Runtime/Export/common_* eol=crlf
+Repositories.ini eol=crlf
+.hgignore eol=crlf
 
 # vs can handle these as lf, but really wants them as crlf
 *.vcproj eol=crlf