diff --git a/build/build.xml b/build/build.xml
index 8c467b739..a1ba1d687 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -1002,6 +1002,18 @@
     </copy>
     <delete dir="${staging_folder}/arduino-builder-windows" includeemptydirs="true"/>
 
+    <exec executable="unzip" failonerror="true">
+      <arg value="-q" />
+      <arg value="-n" />
+      <arg value="-j" />
+      <arg value="-d" />
+      <arg value="windows/work/lib" />
+      <arg value="../arduino-core/lib/jna-4.2.2.jar" />
+      <arg value="com/sun/jna/win32-x86/jnidispatch.dll" />
+    </exec>
+    <move file="windows/work/lib/jnidispatch.dll" tofile="windows/work/lib/jnidispatch-4.2.2-win32-x86.dll" />
+    <chmod perm="755" file="windows/work/lib/jnidispatch-4.2.2-win32-x86.dll" />
+
     <antcall target="assemble">
       <param name="target.path" value="windows/work" />
     </antcall>
diff --git a/build/windows/launcher/config.xml b/build/windows/launcher/config.xml
index 8f99be9e7..2abf18455 100644
--- a/build/windows/launcher/config.xml
+++ b/build/windows/launcher/config.xml
@@ -60,6 +60,9 @@
     <opt>-splash:"%EXEDIR%/lib/splash.png"</opt>
     <opt>-Dsun.java2d.d3d=false</opt>
     <opt>-Djna.nosys=true</opt>
+    <opt>-Djna.nounpack=true</opt>
+    <opt>-Djna.boot.library.name=jnidispatch-4.2.2-win32-x86</opt>
+    <opt>-Djna.boot.library.path="%EXEDIR%"/lib</opt>
     <opt>-DAPP_DIR="%EXEDIR%"</opt>
   </jre>
   <versionInfo>
diff --git a/build/windows/launcher/config_debug.xml b/build/windows/launcher/config_debug.xml
index dbc146563..043866663 100644
--- a/build/windows/launcher/config_debug.xml
+++ b/build/windows/launcher/config_debug.xml
@@ -59,6 +59,10 @@
     <runtimeBits>32</runtimeBits>
     <opt>-Dsun.java2d.d3d=false</opt>
     <opt>-Djna.nosys=true</opt>
+    <opt>-Djna.nounpack=true</opt>
+    <opt>-Djna.boot.library.name=jnidispatch-4.2.2-win32-x86</opt>
+    <opt>-Djna.boot.library.path="%EXEDIR%"/lib</opt>
+    <opt>-Djna.debug_load=true</opt>
     <opt>-DAPP_DIR="%EXEDIR%"</opt>
     <opt>-DDEBUG=true</opt>
   </jre>