diff --git a/.eslintrc b/.eslintrc
index f9b0ef3b015f77..5a2f406a6270c2 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -60,7 +60,7 @@ rules:
   indent: [2, 2, {SwitchCase: 1}]
   key-spacing: [2, {mode: "minimum"}]
   keyword-spacing: 2
-  linebreak-style: [2, "unix"]
+  linebreak-style: 0
   max-len: [2, 80, 2]
   new-parens: 2
   no-mixed-spaces-and-tabs: 2
diff --git a/.gitattributes b/.gitattributes
index fa5162684b8dc8..9c1c9c4d692440 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1,45 @@
+* -text
+./* text=auto
+*.bat text
+*.c text
+*.cc text
+*.css text
+*.d text
+*.def text
+*.gyp text
+*.gypi text
+*.h text
+*.html text
+*.inc text
+*.js text
+*.json text
+*.man text
+*.manifest text
+*.md text
+*.out text
+*.pl text
+*.py text
+*.rb text
+*.rc text
+*.sln text
+*.status text
+*.txt text
+*.vcxproj text
+*.wixproj text
+*.wxl text
+*.wxs text
+*.yml text
+tools/msvs/npm/npmrc text
+deps/v8/test/mjsunit/regress/regress-2825.js -text
+
 test/fixtures/* -text
-vcbuild.bat text eol=crlf
+
+# Exceptions for dependencies committed with CRLF line endings
+# Should be removed when the files are updated
+deps/npm/node_modules/node-gyp/gyp/gyp.bat -text
+deps/npm/node_modules/node-gyp/gyp/samples/samples.bat -text
+deps/uv/docs/make.bat -text
+deps/v8/test/message/regress/regress-73.js -text
+deps/zlib/contrib/minizip/ChangeLogUnzip -text
+tools/gyp/gyp.bat -text
+tools/gyp/samples/samples.bat -text