diff --git a/Crystal.sublime-build b/Crystal.sublime-build
index 9e091f7..3e8e192 100644
--- a/Crystal.sublime-build
+++ b/Crystal.sublime-build
@@ -1,5 +1,9 @@
 {
-	"shell_cmd": "crystal \"$file\"",
+	"cmd": ["crystal", "\"$file\""],
+	"shell": true,
 	"file_regex": "^(...*?):([0-9]*):?([0-9]*)",
-	"selector": "source.crystal"
+	"selector": "source.crystal",
+	"windows": {
+		"cmd": ["bash", "-c", "crystal \"$file_name\""]
+	}
 }