diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..176a458
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+* text=auto
diff --git a/bin/install-elm-format b/bin/install-elm-format
index 23da76e..031c299 100755
--- a/bin/install-elm-format
+++ b/bin/install-elm-format
@@ -8,12 +8,18 @@ case $(uname) in
         echo "linux";;
     (Windows*)
         echo "windows";;
+    (MINGW*)
+        echo "windows";;
     (*)
         echo "linux";;
 esac)
 
-URL=https://github.com/avh4/elm-format/releases/download/0.6.1-alpha/elm-format-0.18-0.6.1-alpha-$OS-x64.tgz
-
-curl -L $URL | tar -xvzO > bin/elm-format
+if [ "$OS" == "windows" ]; then
+  URL=https://github.com/avh4/elm-format/releases/download/0.6.1-alpha/elm-format-0.18-0.6.1-alpha-win-i386.zip
+  curl -L $URL | funzip > bin/elm-format
+else
+  URL=https://github.com/avh4/elm-format/releases/download/0.6.1-alpha/elm-format-0.18-0.6.1-alpha-$OS-x64.tgz
+  curl -L $URL | tar -xvzO > bin/elm-format
+fi
 
 chmod u+x bin/elm-format