diff --git a/build.xml b/build.xml
index 95081b32..172dd5d8 100644
--- a/build.xml
+++ b/build.xml
@@ -320,6 +320,7 @@
 	</target>
 
 	<target name="msi-arch">
+		<property name="jnidispatch" location="${dir.lib}/native/win32-${arch}/jnidispatch.dll" />
 		<property name="mediainfo" location="${dir.lib}/native/win32-${arch}/MediaInfo.dll" />
 		<property name="lib7z_binding" location="${dir.lib}/native/win32-${arch}/7-Zip-JBinding.dll" />
 		<property name="libgcc_path" location="${dir.lib}/native/win32-${arch}/${libgcc_name}" />
@@ -327,7 +328,7 @@
 		<property name="installer" location="${dir.dist}/FileBot_${version}_${arch}.msi" />
 
 		<exec executable="candle.exe" dir="${dir.installer}/msi" failonerror="true">
-			<arg line="filebot-wix.xml -out ${dir.dist}/msi.wixobj -darch=${arch} -dreleaseversion=${version} -dfatjar=${path.fatjar} -dmediainfo=${mediainfo} -dlib7z_binding=${lib7z_binding} -dlibgcc_name=${libgcc_name} -dlibgcc_path=${libgcc_path} -dfpcalc_path=${fpcalc_path}" />
+			<arg line="filebot-wix.xml -out ${dir.dist}/msi.wixobj -darch=${arch} -dreleaseversion=${version} -dfatjar=${path.fatjar} -djnidispatch=${jnidispatch} -dmediainfo=${mediainfo} -dlib7z_binding=${lib7z_binding} -dlibgcc_name=${libgcc_name} -dlibgcc_path=${libgcc_path} -dfpcalc_path=${fpcalc_path}" />
 		</exec>
 		<exec executable="light.exe" dir="${dir.installer}/msi" failonerror="true">
 			<arg line="${dir.dist}/msi.wixobj -sval -ext WixUIExtension -out ${installer}" />
diff --git a/installer/msi/filebot-wix.xml b/installer/msi/filebot-wix.xml
index dfcb5291..db384396 100644
--- a/installer/msi/filebot-wix.xml
+++ b/installer/msi/filebot-wix.xml
@@ -51,6 +51,7 @@
 					
 					<Component Id='ApplicationBase' Guid='9E365344-A00C-45DE-A2A4-266412C3D06E' Win64="$(var.Win64)">
 						<File Id='FileBot.jar' Name='FileBot.jar' Source='$(var.fatjar)' KeyPath='yes' />
+						<File Id='jnidispatch.dll' Name='jnidispatch.dll' Source='$(var.jnidispatch)' />
 						<File Id='MediaInfo.dll' Name='MediaInfo.dll' Source='$(var.mediainfo)' />
 						<File Id='lib7_Zip_JBinding.dll' Name='7-Zip-JBinding.dll' Source='$(var.lib7z_binding)' />
 						<File Id='libgcc.dll' Name='$(var.libgcc_name)' Source='$(var.libgcc_path)' />
diff --git a/installer/msi/filebot.l4j.ini b/installer/msi/filebot.l4j.ini
index 08d8c153..9b69a5f6 100644
--- a/installer/msi/filebot.l4j.ini
+++ b/installer/msi/filebot.l4j.ini
@@ -2,6 +2,9 @@
 -Dapplication.deployment=msi
 -Dapplication.dir="%APPDATA%\FileBot"
 
+# put all temporary files here
+-Djava.io.tmpdir="%APPDATA%\FileBot\temp"
+
 # FileBot feature settings
 -Dapplication.analytics=true
 
diff --git a/installer/msi/filebot.launcher.l4j.ini b/installer/msi/filebot.launcher.l4j.ini
index c0197a78..918e0e89 100644
--- a/installer/msi/filebot.launcher.l4j.ini
+++ b/installer/msi/filebot.launcher.l4j.ini
@@ -2,6 +2,9 @@
 -Dapplication.deployment=msi
 -Dapplication.dir="%APPDATA%\FileBot"
 
+# put all temporary files here
+-Djava.io.tmpdir="%APPDATA%\FileBot\temp"
+
 # FileBot feature settings
 -Dapplication.warmup=false
 -Dapplication.analytics=true
diff --git a/installer/msi/filebot.platform.launcher.l4j.ini b/installer/msi/filebot.platform.launcher.l4j.ini
index 075c5a8a..3400349b 100644
--- a/installer/msi/filebot.platform.launcher.l4j.ini
+++ b/installer/msi/filebot.platform.launcher.l4j.ini
@@ -2,6 +2,9 @@
 -Dapplication.deployment=msi
 -Dapplication.dir="%APPDATA%\FileBot"
 
+# put all temporary files here
+-Djava.io.tmpdir="%APPDATA%\FileBot\temp"
+
 # FileBot system properties
 -DthreadPool=8
 -Dunixfs=false
diff --git a/lib/native/win32-x64/jnidispatch.dll b/lib/native/win32-x64/jnidispatch.dll
new file mode 100644
index 00000000..07cad853
Binary files /dev/null and b/lib/native/win32-x64/jnidispatch.dll differ
diff --git a/lib/native/win32-x86/jnidispatch.dll b/lib/native/win32-x86/jnidispatch.dll
new file mode 100644
index 00000000..7bdb4362
Binary files /dev/null and b/lib/native/win32-x86/jnidispatch.dll differ