diff --git a/app/.classpath b/app/.classpath
index b7dd58fc4..315612244 100644
--- a/app/.classpath
+++ b/app/.classpath
@@ -42,7 +42,7 @@
 	<classpathentry kind="lib" path="lib/slf4j-api-1.7.22.jar"/>
 	<classpathentry kind="lib" path="lib/slf4j-simple-1.7.22.jar"/>
 	<classpathentry kind="lib" path="lib/jsch-0.1.50.jar"/>
-	<classpathentry kind="lib" path="lib/jssc-2.8.0.jar"/>
+	<classpathentry kind="lib" path="lib/jssc-2.8.0-arduino1.jar"/>
 	<classpathentry kind="lib" path="lib/rsyntaxtextarea-2.6.1.jar"/>
 	<classpathentry kind="lib" path="lib/xml-apis-1.3.04.jar"/>
 	<classpathentry kind="lib" path="lib/xml-apis-ext-1.3.04.jar"/>
diff --git a/app/lib/jssc-2.8.0.jar b/app/lib/jssc-2.8.0-arduino1.jar
old mode 100644
new mode 100755
similarity index 86%
rename from app/lib/jssc-2.8.0.jar
rename to app/lib/jssc-2.8.0-arduino1.jar
index d2b5c070a..3cf257ea6
Binary files a/app/lib/jssc-2.8.0.jar and b/app/lib/jssc-2.8.0-arduino1.jar differ
diff --git a/arduino-core/.classpath b/arduino-core/.classpath
index 4167a9dd3..99329d1b8 100644
--- a/arduino-core/.classpath
+++ b/arduino-core/.classpath
@@ -8,7 +8,7 @@
 	<classpathentry kind="lib" path="lib/jmdns-3.5.1.jar"/>
 	<classpathentry kind="lib" path="lib/slf4j-api-1.7.22.jar"/>
 	<classpathentry kind="lib" path="lib/slf4j-simple-1.7.22.jar"/>
-	<classpathentry kind="lib" path="lib/jssc-2.8.0.jar"/>
+	<classpathentry kind="lib" path="lib/jssc-2.8.0-arduino1.jar"/>
 	<classpathentry kind="lib" path="lib/jsch-0.1.50.jar"/>
 	<classpathentry kind="lib" path="lib/commons-exec-1.1.jar"/>
 	<classpathentry kind="lib" path="../app/lib/commons-codec-1.7.jar"/>
diff --git a/arduino-core/lib/jssc-2.8.0.jar b/arduino-core/lib/jssc-2.8.0-arduino1.jar
old mode 100644
new mode 100755
similarity index 86%
rename from arduino-core/lib/jssc-2.8.0.jar
rename to arduino-core/lib/jssc-2.8.0-arduino1.jar
index d2b5c070a..3cf257ea6
Binary files a/arduino-core/lib/jssc-2.8.0.jar and b/arduino-core/lib/jssc-2.8.0-arduino1.jar differ
diff --git a/build/build.xml b/build/build.xml
index f8a467e28..ebf69b67a 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -1037,6 +1037,33 @@
       <param name="file" value="windows/work/lib/jnidispatch-4.2.2-win32-x86.dll" />
     </antcall>
 
+    <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/jssc-2.8.0-arduino1.jar" />
+      <arg value="libs/windows/jSSC-2.8_x86.dll" />
+    </exec>
+    <move file="windows/work/lib/jSSC-2.8_x86.dll" tofile="windows/work/lib/jSSC-2.8_x86.dll" />
+    <antcall target="make-file-executable">
+      <param name="file" value="windows/work/lib/jSSC-2.8_x86.dll" />
+    </antcall>
+    <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/jssc-2.8.0-arduino1.jar" />
+      <arg value="libs/windows/jSSC-2.8_x86_64.dll" />
+    </exec>
+    <move file="windows/work/lib/jSSC-2.8_x86_64.dll" tofile="windows/work/lib/jSSC-2.8_x86_64.dll" />
+    <antcall target="make-file-executable">
+      <param name="file" value="windows/work/lib/jSSC-2.8_x86_64.dll" />
+    </antcall>
+
     <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 2abf18455..9b9faf4c0 100644
--- a/build/windows/launcher/config.xml
+++ b/build/windows/launcher/config.xml
@@ -47,7 +47,7 @@
     <cp>%EXEDIR%/lib/jna-4.2.2.jar</cp>
     <cp>%EXEDIR%/lib/jna-platform-4.2.2.jar</cp>
     <cp>%EXEDIR%/lib/jsch-0.1.50.jar</cp>
-    <cp>%EXEDIR%/lib/jssc-2.8.0.jar</cp>
+    <cp>%EXEDIR%/lib/jssc-2.8.0-arduino1.jar</cp>
     <cp>%EXEDIR%/lib/pde.jar</cp>
     <cp>%EXEDIR%/lib/rsyntaxtextarea-2.6.1.jar</cp>
     <cp>%EXEDIR%/lib/xml-apis-1.3.04.jar</cp>
@@ -63,6 +63,7 @@
     <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>-Djssc.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 043866663..fb7cebe87 100644
--- a/build/windows/launcher/config_debug.xml
+++ b/build/windows/launcher/config_debug.xml
@@ -47,7 +47,7 @@
     <cp>%EXEDIR%/lib/jna-4.2.2.jar</cp>
     <cp>%EXEDIR%/lib/jna-platform-4.2.2.jar</cp>
     <cp>%EXEDIR%/lib/jsch-0.1.50.jar</cp>
-    <cp>%EXEDIR%/lib/jssc-2.8.0.jar</cp>
+    <cp>%EXEDIR%/lib/jssc-2.8.0-arduino1.jar</cp>
     <cp>%EXEDIR%/lib/pde.jar</cp>
     <cp>%EXEDIR%/lib/rsyntaxtextarea-2.6.1.jar</cp>
     <cp>%EXEDIR%/lib/xml-apis-1.3.04.jar</cp>
@@ -62,6 +62,7 @@
     <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>-Djssc.library.path="%EXEDIR%"/lib</opt>
     <opt>-Djna.debug_load=true</opt>
     <opt>-DAPP_DIR="%EXEDIR%"</opt>
     <opt>-DDEBUG=true</opt>