diff --git a/app/.classpath b/app/.classpath
index d63b38f43..72c373710 100644
--- a/app/.classpath
+++ b/app/.classpath
@@ -4,6 +4,7 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/processing-core"/>
 	<classpathentry kind="lib" path="lib/jna.jar"/>
+	<classpathentry kind="lib" path="lib/jna-platform.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/ant.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/ant-launcher.jar"/>
 	<classpathentry kind="lib" path="test/lib/junit-4.8.1.jar"/>
diff --git a/app/build.xml b/app/build.xml
index 677e32768..b6d97218a 100644
--- a/app/build.xml
+++ b/app/build.xml
@@ -38,7 +38,8 @@
                       ../core/apple.jar; 
                       lib/ant.jar; 
                       lib/ant-launcher.jar; 
-                      lib/jna.jar"
+                      lib/jna.jar;
+                      lib/jna-platform.jar"
 	   debug="on"
 	   nowarn="true"
 	   compiler="org.eclipse.jdt.core.JDTCompilerAdapter">
diff --git a/build/build.xml b/build/build.xml
index c0cf4734d..a6508c507 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -278,6 +278,7 @@
     <include name="app/pde.jar" />
     <include name="app/lib/antlr.jar" />
     <include name="app/lib/jna.jar" />
+    <include name="app/lib/jna-platform.jar" />
     <include name="app/lib/ant.jar" />
     <include name="app/lib/ant-launcher.jar" />
   </fileset>
@@ -516,6 +517,7 @@
       <classpath file="../app/pde.jar" />
       <classpath file="../app/lib/antlr.jar" />
       <classpath file="../app/lib/jna.jar" />
+      <classpath file="../app/lib/jna-platform.jar" />
       <classpath file="../app/lib/ant.jar" />
       <classpath file="../app/lib/ant-launcher.jar" />
 
@@ -1032,7 +1034,7 @@
     <condition property="jna.subfolder" value="win32-x86"> 
       <equals arg1="${sun.arch.data.model}" arg2="32" />
     </condition>
-    <condition property="jna.subfolder" value="win32-amd64"> 
+    <condition property="jna.subfolder" value="win32-x86-64">
       <equals arg1="${sun.arch.data.model}" arg2="64" />
     </condition>
 
@@ -1292,7 +1294,7 @@ remove the spaces for depth since it should be double dash, but screws up commen
       <arg line="everything -type f -exec rm -rf {} ';'" />
     </exec>
 
-    <javadoc access="public" author="false" classpath="../app/lib/ant.jar:../app/lib/ant-launcher.jar:../app/lib/antlr.jar:../app/lib/apple.jar:../app/lib/jna.jar:../core/bin:../core/library/gluegen-rt.jar:../core/library/jogl-all.jar:../java/libraries/svg/bin:../java/libraries/pdf/bin:../java/libraries/pdf/library/itext.jar:../java/libraries/dxf/bin:../java/libraries/io/bin:../java/libraries/net/bin:../java/libraries/serial/bin:${java.home}/lib/tools.jar" destdir="javadoc/everything" nodeprecated="false" nodeprecatedlist="false" noindex="false" nonavbar="false" notree="false" source="1.8" splitindex="false" use="false" version="false" noqualifier="all">
+    <javadoc access="public" author="false" classpath="../app/lib/ant.jar:../app/lib/ant-launcher.jar:../app/lib/antlr.jar:../app/lib/apple.jar:../app/lib/jna.jar:../app/lib/jna-platform.jar:../core/bin:../core/library/gluegen-rt.jar:../core/library/jogl-all.jar:../java/libraries/svg/bin:../java/libraries/pdf/bin:../java/libraries/pdf/library/itext.jar:../java/libraries/dxf/bin:../java/libraries/io/bin:../java/libraries/net/bin:../java/libraries/serial/bin:${java.home}/lib/tools.jar" destdir="javadoc/everything" nodeprecated="false" nodeprecatedlist="false" noindex="false" nonavbar="false" notree="false" source="1.8" splitindex="false" use="false" version="false" noqualifier="all">
 
       <arg value="-notimestamp" />
 
@@ -1325,7 +1327,7 @@ remove the spaces for depth since it should be double dash, but screws up commen
       <arg line="libraries -type f -exec rm -rf {} ';'" />
     </exec>
 
-    <javadoc access="public" author="false" classpath="../app/lib/ant.jar:../app/lib/ant-launcher.jar:../app/lib/antlr.jar:../app/lib/apple.jar:../app/lib/jna.jar:../core/bin:../core/library/gluegen-rt.jar:../core/library/jogl-all.jar:../java/libraries/svg/bin:../java/libraries/pdf/bin:../java/libraries/pdf/library/itext.jar:../java/libraries/dxf/bin:../java/libraries/net/bin:../java/libraries/serial/bin:${java.home}/lib/tools.jar" destdir="javadoc/libraries" nodeprecated="false" nodeprecatedlist="false" noindex="false" nonavbar="false" notree="false" source="1.8" splitindex="false" use="false" version="false" noqualifier="all">
+    <javadoc access="public" author="false" classpath="../app/lib/ant.jar:../app/lib/ant-launcher.jar:../app/lib/antlr.jar:../app/lib/apple.jar:../app/lib/jna.jar:../app/lib/jna-platform.jar:../core/bin:../core/library/gluegen-rt.jar:../core/library/jogl-all.jar:../java/libraries/svg/bin:../java/libraries/pdf/bin:../java/libraries/pdf/library/itext.jar:../java/libraries/dxf/bin:../java/libraries/net/bin:../java/libraries/serial/bin:${java.home}/lib/tools.jar" destdir="javadoc/libraries" nodeprecated="false" nodeprecatedlist="false" noindex="false" nonavbar="false" notree="false" source="1.8" splitindex="false" use="false" version="false" noqualifier="all">
 
       <arg value="-notimestamp" />
 
diff --git a/build/windows/config.xml b/build/windows/config.xml
index 771501603..7eedde6d2 100644
--- a/build/windows/config.xml
+++ b/build/windows/config.xml
@@ -18,6 +18,7 @@
     <cp>lib/pde.jar</cp>
     <cp>core/library/core.jar</cp>
     <cp>lib/jna.jar</cp>
+    <cp>lib/jna-platform.jar</cp>
     <cp>lib/antlr.jar</cp>
     <cp>lib/ant.jar</cp>
     <cp>lib/ant-launcher.jar</cp>
diff --git a/build/windows/processing.bat b/build/windows/processing.bat
index 2843a7c90..c5ec6768a 100755
--- a/build/windows/processing.bat
+++ b/build/windows/processing.bat
@@ -1,3 +1,3 @@
 @echo off
 
-.\java\bin\java -cp lib/pde.jar;core/library/core.jar;lib/jna.jar;lib/antlr.jar;lib/ant.jar;lib/ant-launcher.jar processing.app.Base
\ No newline at end of file
+.\java\bin\java -cp lib/pde.jar;core/library/core.jar;lib/jna.jar;lib/jna-platform.jar;lib/antlr.jar;lib/ant.jar;lib/ant-launcher.jar processing.app.Base
\ No newline at end of file
diff --git a/java/build.xml b/java/build.xml
index ec5e0526a..32932744b 100644
--- a/java/build.xml
+++ b/java/build.xml
@@ -109,6 +109,7 @@
                       ../app/lib/ant-launcher.jar; 
                       ../app/lib/apple.jar; 
                       ../app/lib/jna.jar; 
+                      ../app/lib/jna-platform.jar; 
 
                       mode/antlr.jar; 
                       mode/classpath-explorer-1.0.jar;