diff --git a/.gitattributes b/.gitattributes
index 5299044761e..6dee4b041c5 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,3 +1,4 @@
 *.py diff=python
 *.lp linguist-language=Prolog
 lib/spack/external/* linguist-vendored
+*.bat text eol=crlf
\ No newline at end of file
diff --git a/bin/spack.bat b/bin/spack.bat
index 073f778c347..310b59506c0 100644
--- a/bin/spack.bat
+++ b/bin/spack.bat
@@ -226,7 +226,7 @@ for %%Z in ("%_pa_new_path%") do if EXIST %%~sZ\NUL (
 exit /b 0
 
 :: set module system roots
-:_sp_multi_pathadd 
+:_sp_multi_pathadd
 for %%I in (%~2) do (
     for %%Z in (%_sp_compatible_sys_types%) do (
         :pathadd "%~1" "%%I\%%Z"