diff --git a/build/build.xml b/build/build.xml
index 76ea9bed1..35e6fcc7a 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -26,7 +26,7 @@
     <include name="app/pde.jar" />
     <include name="app/lib/ecj.jar" />
     <include name="app/lib/jna.jar" />
-    <include name="app/lib/jssc.jar" />
+    <include name="app/lib/RXTXcomm.jar" />
     <include name="app/lib/ant.jar" />
     <include name="app/lib/ant-launcher.jar" />
   </fileset>
@@ -448,6 +448,10 @@
       <fileset file="shared/revisions.txt" />
     </copy>
 
+    <copy todir="linux/work">
+      <fileset dir="linux/dist" includes="lib/**" />
+    </copy>
+
     <copy todir="linux/work/lib" flatten="true">
       <fileset refid="runtime.jars" />
     </copy>
@@ -485,6 +489,7 @@
 
   <target name="linux64-build" depends="linux-build" description="Build linux (64-bit) version">
     <copy tofile="linux/work/hardware/tools/avrdude" file="linux/dist/tools/avrdude64" overwrite="true" />
+    <copy tofile="linux/work/lib/librxtxSerial.so" file="linux/dist/lib/librxtxSerial64.so" overwrite="true" />
 
     <chmod perm="755" file="linux/work/hardware/tools/avrdude" />
 
diff --git a/build/linux/dist/lib/librxtxSerial.so b/build/linux/dist/lib/librxtxSerial.so
new file mode 100644
index 000000000..2cc270df8
Binary files /dev/null and b/build/linux/dist/lib/librxtxSerial.so differ
diff --git a/build/linux/dist/lib/librxtxSerial64.so b/build/linux/dist/lib/librxtxSerial64.so
new file mode 100755
index 000000000..c311b800d
Binary files /dev/null and b/build/linux/dist/lib/librxtxSerial64.so differ
diff --git a/build/macosx/template.app/Contents/Info.plist b/build/macosx/template.app/Contents/Info.plist
index 90b9f2790..5449b75f7 100755
--- a/build/macosx/template.app/Contents/Info.plist
+++ b/build/macosx/template.app/Contents/Info.plist
@@ -76,7 +76,7 @@
       <!-- In 0149, removed /System/Library/Java from the CLASSPATH because
            it can cause problems if users have installed weird files there.
            http://dev.processing.org/bugs/show_bug.cgi?id=1045 -->
-      <string>$JAVAROOT/pde.jar:$JAVAROOT/core.jar:$JAVAROOT/antlr.jar:$JAVAROOT/ecj.jar:$JAVAROOT/registry.jar:$JAVAROOT/quaqua.jar:$JAVAROOT/jssc.jar</string>
+      <string>$JAVAROOT/pde.jar:$JAVAROOT/core.jar:$JAVAROOT/antlr.jar:$JAVAROOT/ecj.jar:$JAVAROOT/registry.jar:$JAVAROOT/quaqua.jar:$JAVAROOT/RXTXcomm.jar</string>
 
       <key>JVMArchs</key>  
       <array>  
diff --git a/build/macosx/template.app/Contents/Resources/Java/librxtxSerial.jnilib b/build/macosx/template.app/Contents/Resources/Java/librxtxSerial.jnilib
new file mode 100644
index 000000000..5a3bb0b5e
Binary files /dev/null and b/build/macosx/template.app/Contents/Resources/Java/librxtxSerial.jnilib differ
diff --git a/build/windows/dist/rxtxSerial.dll b/build/windows/dist/rxtxSerial.dll
new file mode 100644
index 000000000..c66c1ccb8
Binary files /dev/null and b/build/windows/dist/rxtxSerial.dll differ
diff --git a/build/windows/launcher/config.xml b/build/windows/launcher/config.xml
index 2993be586..b1fbf6630 100755
--- a/build/windows/launcher/config.xml
+++ b/build/windows/launcher/config.xml
@@ -19,7 +19,7 @@
     <cp>lib/core.jar</cp>
     <cp>lib/jna.jar</cp>
     <cp>lib/ecj.jar</cp>
-    <cp>lib/jssc.jar</cp>
+    <cp>lib/RXTXcomm.jar</cp>
     <cp>lib/commons-exec-1.1.jar</cp>
   </classPath>
   <jre>