diff --git a/mibuild/xilinx_vivado.py b/mibuild/xilinx_vivado.py
index 9f6456c93..abf6ec93a 100644
--- a/mibuild/xilinx_vivado.py
+++ b/mibuild/xilinx_vivado.py
@@ -68,17 +68,20 @@ def _build_files(device, sources, vincpaths, build_name, bitstream_compression):
 	tools.write_to_file(build_name + ".tcl", "\n".join(tcl))
 
 def _run_vivado(build_name, vivado_path, source, ver=None):
-	if sys.platform == "win32" or sys.platform == "cygwin":
-		source = False
 	build_script_contents = "# Autogenerated by mibuild\nset -e\n"
-	if source:
+	if sys.platform == "win32" or sys.platform == "cygwin":
+		build_script_contents += "vivado -mode batch -source " + build_name + ".tcl\n"
+		build_script_file = "build_" + build_name + ".bat"
+		tools.write_to_file(build_script_file, build_script_contents)
+		r = subprocess.call([build_script_file])
+	else:
 		settings = xilinx_common.settings(vivado_path, ver)
 		build_script_contents += "source " + settings + "\n"
-	build_script_contents += "vivado -mode batch -source " + build_name + ".tcl\n"
-	build_script_file = "build_" + build_name + ".sh"
-	tools.write_to_file(build_script_file, build_script_contents, force_unix=True)
+		build_script_contents += "vivado -mode batch -source " + build_name + ".tcl\n"
+		build_script_file = "build_" + build_name + ".sh"
+		tools.write_to_file(build_script_file, build_script_contents)
+		r = subprocess.call(["bash", build_script_file])
 
-	r = subprocess.call(["bash", build_script_file])
 	if r != 0:
 		raise OSError("Subprocess failed")