diff --git a/installer/deb/filebot.sh b/installer/deb/filebot.sh
index 1c490bb5..3e009c7e 100644
--- a/installer/deb/filebot.sh
+++ b/installer/deb/filebot.sh
@@ -1 +1 @@
-java -Dapplication.deployment=deb -Djna.library.path=/usr/share/filebot -Xmx256m -jar /usr/share/filebot/FileBot.jar "$@"
\ No newline at end of file
+java -Dapplication.deployment=deb -Djna.library.path=/usr/share/filebot -Xmx256m -jar /usr/share/filebot/FileBot.jar $@
\ No newline at end of file
diff --git a/installer/msi/FileBotCmd.exe b/installer/msi/FileBotCmd.exe
deleted file mode 100644
index 2c5a79b9..00000000
Binary files a/installer/msi/FileBotCmd.exe and /dev/null differ
diff --git a/installer/msi/filebot-wix.xml b/installer/msi/filebot-wix.xml
index d291a276..bd603e3e 100644
--- a/installer/msi/filebot-wix.xml
+++ b/installer/msi/filebot-wix.xml
@@ -17,7 +17,7 @@
 					</Component>
 
 					<Component Id='ApplicationStubCmd' Guid='D2B1A845-3B5C-4B59-B0D0-A4E80C173220'>
-						<File Id='FileBotCmd.exe' Name='FileBotCmd.exe' Source='FileBotCmd.exe' KeyPath='yes' />
+						<File Id='filebot.cmd' Name='filebot.cmd' Source='filebot.cmd' KeyPath='yes' />
 					</Component>
 
 					<Component Id='MainJar' Guid='9E365344-A00C-45DE-A2A4-266412C3D06E'>
diff --git a/installer/msi/filebot.cmd b/installer/msi/filebot.cmd
new file mode 100644
index 00000000..33d1d7c3
--- /dev/null
+++ b/installer/msi/filebot.cmd
@@ -0,0 +1 @@
+java -Dapplication.deployment=msi -Xmx256m -jar FileBot.jar %*
\ No newline at end of file