diff --git a/tools/server/mini-files.js b/tools/server/mini-files.js
index 6c2ad52f11..0249660159 100644
--- a/tools/server/mini-files.js
+++ b/tools/server/mini-files.js
@@ -63,7 +63,9 @@ var convertToOSLineEndings = function (fileContents) {
 };
 
 var convertToStandardLineEndings = function (fileContents) {
-  return fileContents.replace(new RegExp(os.EOL, "g"), "\n");
+  // Convert all kinds of end-of-line chars to linuxy "\n".
+  return fileContents.replace(new RegExp("\r\n", "g"), "\n")
+                     .replace(new RegExp("\r", "g"), "\n");
 };