diff --git a/Build/copy_assets_and_emuhawk_to_output.bat b/Build/copy_assets_and_emuhawk_to_output.bat
new file mode 100644
index 0000000000..02d4f2779a
--- /dev/null
+++ b/Build/copy_assets_and_emuhawk_to_output.bat
@@ -0,0 +1,11 @@
+CHDIR "%~dp0\.."
+
+ROBOCOPY /E Assets output
+
+FOR /D %%D IN (src\BizHawk.Client.EmuHawk\bin\*) DO (
+ ROBOCOPY %%D output
+ RENAME output\BizHawk.Client.EmuHawk.exe EmuHawk.exe
+ RENAME output\BizHawk.Client.EmuHawk.exe.config EmuHawk.exe.config
+ goto end
+)
+:end
diff --git a/Build/copy_assets_and_emuhawk_to_output.sh b/Build/copy_assets_and_emuhawk_to_output.sh
new file mode 100755
index 0000000000..15915f9163
--- /dev/null
+++ b/Build/copy_assets_and_emuhawk_to_output.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+cd "$(dirname "$0")/.."
+cp -f -r Assets/* output || printf ""
+cd src/BizHawk.Client.EmuHawk/bin && for d in *; do
+ cp -f $d/* ../../../output && cd ../../../output && mv BizHawk.Client.EmuHawk.exe EmuHawk.exe && mv BizHawk.Client.EmuHawk.exe.config EmuHawk.exe.config && exit 0
+done
diff --git a/Dist/copy_assets_and_emuhawk_to_output.bat b/Dist/copy_assets_and_emuhawk_to_output.bat
deleted file mode 100644
index 4c92412abc..0000000000
--- a/Dist/copy_assets_and_emuhawk_to_output.bat
+++ /dev/null
@@ -1 +0,0 @@
-REM TODO
diff --git a/Dist/copy_assets_and_emuhawk_to_output.sh b/Dist/copy_assets_and_emuhawk_to_output.sh
deleted file mode 100755
index d45a002b69..0000000000
--- a/Dist/copy_assets_and_emuhawk_to_output.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-cd "$(dirname "$0")/.." && (cp -r Assets/* output; cp src/BizHawk.Client.EmuHawk/bin/*/* output)
diff --git a/src/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj b/src/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
index bf1d685db5..d4d0e5a875 100644
--- a/src/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
+++ b/src/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
@@ -634,8 +634,8 @@
-
-
-
+
+
+