diff --git a/build.bat b/build.bat
new file mode 100644
index 0000000..c05c488
--- /dev/null
+++ b/build.bat
@@ -0,0 +1,15 @@
+@echo off
+setlocal enabledelayedexpansion
+
+set DFLAGS=-g
+set CORE=
+set STD=
+set STDD=
+
+for %%x in (src\*.d) do set CORE=!CORE! %%x
+for %%x in (libdparse\src\std\*.d) do set STD=!STD! %%x
+for %%x in (libdparse\src\std\d\*.d) do set STDD=!STDD! %%x
+
+@echo on
+dmd %CORE% %STD% %STDD% %DFLAGS% -ofbin\dfmt.exe
+
diff --git a/src/dfmt.d b/src/dfmt.d
index 1edde17..f73f201 100644
--- a/src/dfmt.d
+++ b/src/dfmt.d
@@ -1235,7 +1235,12 @@ private:
         }
         else
         {
-            output.put(current.text);
+            // You know what's awesome? Windows can't handle its own line
+            // endings correctly.
+            version(Windows)
+                output.put(current.text.replace("\r", ""));
+            else
+                output.put(current.text);
             currentLineLength += current.text.length;
         }
         index++;