diff --git a/installer/msi/filebot-cmd-launch4j.xml b/installer/msi/filebot-cmd-launch4j.xml
new file mode 100644
index 00000000..45206239
--- /dev/null
+++ b/installer/msi/filebot-cmd-launch4j.xml
@@ -0,0 +1,22 @@
+<launch4jConfig>
+  <dontWrapJar>true</dontWrapJar>
+  <headerType>console</headerType>
+  <jar>FileBot.jar</jar>
+  <outfile>filebot.exe</outfile>
+  <errTitle></errTitle>
+  <cmdLine></cmdLine>
+  <chdir></chdir>
+  <priority>normal</priority>
+  <downloadUrl>http://java.com/download</downloadUrl>
+  <supportUrl></supportUrl>
+  <customProcName>false</customProcName>
+  <stayAlive>false</stayAlive>
+  <manifest></manifest>
+  <icon>..\icons\shortcut.ico</icon>
+  <jre>
+    <path></path>
+    <minVersion>1.6.0</minVersion>
+    <maxVersion></maxVersion>
+    <jdkPreference>preferJre</jdkPreference>
+  </jre>
+</launch4jConfig>
\ No newline at end of file
diff --git a/installer/msi/filebot-wix.xml b/installer/msi/filebot-wix.xml
index 2009c5ea..dfcb5291 100644
--- a/installer/msi/filebot-wix.xml
+++ b/installer/msi/filebot-wix.xml
@@ -42,9 +42,10 @@
 					</Component>
 					
 					<Component Id='ApplicationStubCmd' Guid='D2B1A845-3B5C-4B59-B0D0-A4E80C173220' Win64="$(var.Win64)">
-						<File Id='filebot.cmd' Name='filebot.cmd' Source='filebot.cmd' KeyPath='yes'>
+						<File Id='filebot.exe' Name='filebot.exe' Source='filebot.exe' KeyPath='yes'>
 							<Shortcut Id="shortcut.menu.filebot.cmd" Directory="ProgramMenuDir" Name="FileBot (console)" Description="Launch FileBot with debug logging" WorkingDirectory='INSTALLDIR' />
 						</File>
+						<File Id='filebot.l4j.ini' Name='filebot.l4j.ini' Source='filebot.l4j.ini' />
 						<Environment Id="PATH" Name="PATH" Value="[INSTALLDIR]" Action="set" Part="last" Permanent="no" System="yes" />
 					</Component>
 					
diff --git a/installer/msi/filebot.cmd b/installer/msi/filebot.cmd
deleted file mode 100644
index 0fc63b06..00000000
--- a/installer/msi/filebot.cmd
+++ /dev/null
@@ -1,2 +0,0 @@
-@ECHO OFF
-java -Xmx256m -DuseExtendedFileAttributes=true -Dapplication.dir="%APPDATA%\FileBot" -Dapplication.deployment=msi -Dapplication.analytics=true -Djava.net.useSystemProxies=true -Dsun.net.client.defaultConnectTimeout=10000 -Dsun.net.client.defaultReadTimeout=60000 "-Djna.library.path=%~dp0." "-Djava.library.path=%~dp0." -jar "%~dp0FileBot.jar" %*
diff --git a/installer/msi/filebot.exe b/installer/msi/filebot.exe
new file mode 100644
index 00000000..5894a433
Binary files /dev/null and b/installer/msi/filebot.exe differ
diff --git a/installer/msi/filebot.l4j.ini b/installer/msi/filebot.l4j.ini
new file mode 100644
index 00000000..ba70e713
--- /dev/null
+++ b/installer/msi/filebot.l4j.ini
@@ -0,0 +1,18 @@
+# FileBot launch4j runtime config
+-Dapplication.deployment=msi
+-Dapplication.dir="%APPDATA%\FileBot"
+
+# FileBot feature settings
+-Dapplication.analytics=true
+
+# network settings
+-Djava.net.useSystemProxies=true
+-Dsun.net.client.defaultConnectTimeout=10000
+-Dsun.net.client.defaultReadTimeout=60000
+
+# use NTFS extended attributes for storing metadata
+-DuseExtendedFileAttributes=true
+
+# look for native libs here
+-Djna.library.path="%EXEDIR%"
+-Djava.library.path="%EXEDIR%"