diff --git a/app/src/processing/app/debug/BasicUploader.java b/app/src/processing/app/debug/BasicUploader.java
index 1fc87d43a..ebb524219 100644
--- a/app/src/processing/app/debug/BasicUploader.java
+++ b/app/src/processing/app/debug/BasicUploader.java
@@ -141,6 +141,10 @@ public class BasicUploader extends Uploader  {
         throw new RunnerException(e.getMessage());
       }
       prefs.put("serial.port", uploadPort);
+      if (uploadPort.startsWith("/dev/"))
+        prefs.put("serial.port.file", uploadPort.substring(5));
+      else
+        prefs.put("serial.port.file", uploadPort);
     }
     
     prefs.put("build.path", buildPath);
diff --git a/build/windows/bossac.exe b/build/windows/bossac.exe
index 1f5235e45..39d975fd6 100755
Binary files a/build/windows/bossac.exe and b/build/windows/bossac.exe differ