diff --git a/.gitattributes b/.gitattributes
index d4ee1cb7f3..cc84a50010 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -50,3 +50,9 @@
 *.sln text=auto eol=crlf
 
 *.sh eol=lf
+
+# Workaround for npm changing line endings from CRLF to LF on Windows. Should be fixed in npm 5.8.0.
+# https://github.com/npm/npm/issues/17161#issuecomment-337696678
+# https://github.com/npm/npm/releases/tag/v5.8.0-next.0
+package.json text eol=lf
+package-lock.json text eol=lf