diff --git a/app/build.xml b/app/build.xml
index 06cc52fd7a1..cdad7cfbfa7 100644
--- a/app/build.xml
+++ b/app/build.xml
@@ -44,7 +44,7 @@
 	   encoding="UTF-8"
 	   includeAntRuntime="false"
 	   debug="true"
-	   classpath="../core/core.jar; ${env.JAVA_HOME}/lib/tools.jar; lib/ant.jar; lib/ant-launcher.jar; lib/apple.jar; lib/ecj.jar; lib/jna.jar; lib/RXTXcomm.jar" />
+	   classpath="../core/core.jar; ${env.JAVA_HOME}/lib/tools.jar; lib/ant.jar; lib/ant-launcher.jar; lib/apple.jar; lib/ecj.jar; lib/jna.jar; lib/nrjavaserial.jar" />
     <copy todir="bin" overwrite="true" verbose="true">
       <fileset dir="src" includes="**/*.properties" />
     </copy>
diff --git a/app/lib/RXTXcomm.jar b/app/lib/RXTXcomm.jar
deleted file mode 100644
index 8971c811401..00000000000
Binary files a/app/lib/RXTXcomm.jar and /dev/null differ
diff --git a/app/lib/nrjavaserial.jar b/app/lib/nrjavaserial.jar
new file mode 100644
index 00000000000..13e0405396c
Binary files /dev/null and b/app/lib/nrjavaserial.jar differ
diff --git a/app/src/processing/app/macosx/Platform.java b/app/src/processing/app/macosx/Platform.java
index eb79bec2bf8..28bbbbbf2d7 100644
--- a/app/src/processing/app/macosx/Platform.java
+++ b/app/src/processing/app/macosx/Platform.java
@@ -23,6 +23,7 @@
 package processing.app.macosx;
 
 import java.awt.Insets;
+import java.awt.Toolkit;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.lang.reflect.Method;
@@ -42,6 +43,12 @@
  */
 public class Platform extends processing.app.Platform {
 
+  public Platform() {
+    // workaround for in OS X port of openJdk: 
+    //http://mail.openjdk.java.net/pipermail/macosx-port-dev/2013-January/005261.html
+    Toolkit.getDefaultToolkit();
+  }
+  
   public void setLookAndFeel() throws Exception {
     // Use the Quaqua L & F on OS X to make JFileChooser less awful
     UIManager.setLookAndFeel("ch.randelshofer.quaqua.QuaquaLookAndFeel");
diff --git a/build/build.xml b/build/build.xml
index 91d562346cd..9df64f6f3fe 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/RXTXcomm.jar" />
+    <include name="app/lib/nrjavaserial.jar" />
     <include name="app/lib/ant.jar" />
     <include name="app/lib/ant-launcher.jar" />
   </fileset>
diff --git a/build/macosx/template.app/Contents/Info.plist b/build/macosx/template.app/Contents/Info.plist
index 5449b75f71f..084043ba5a4 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/RXTXcomm.jar</string>
+      <string>$JAVAROOT/pde.jar:$JAVAROOT/core.jar:$JAVAROOT/antlr.jar:$JAVAROOT/ecj.jar:$JAVAROOT/registry.jar:$JAVAROOT/quaqua.jar:$JAVAROOT/nrjavaserial.jar</string>
 
       <key>JVMArchs</key>  
       <array>