diff --git a/.gitattributes b/.gitattributes
index 4f30821a9046f2..7ead819fab5525 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -21,7 +21,11 @@
 *.in text eol=lf
 *.sh text eol=lf
 
-*.cs text=auto diff=csharp 
+# Likewise, force cmd and batch scripts to always use crlf
+*.cmd text eol=crlf
+*.bat text eol=crlf
+
+*.cs text=auto diff=csharp
 *.vb text=auto
 *.resx text=auto
 *.c text=auto