diff --git a/.gitignore b/.gitignore
index 54d94ffce..f61a9a6d4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,6 +31,7 @@ build/macosx/libastylej*
 build/macosx/appbundler*.jar
 build/macosx/appbundler*.zip
 build/macosx/appbundler
+build/macosx/appbundler-1.0ea-arduino2
 build/linux/work/
 build/linux/dist/*.tar.gz
 build/linux/dist/*.tar.bz2
diff --git a/arduino-core/src/processing/app/helpers/CommandlineParser.java b/arduino-core/src/processing/app/helpers/CommandlineParser.java
index f29e48a1d..2fc43b103 100644
--- a/arduino-core/src/processing/app/helpers/CommandlineParser.java
+++ b/arduino-core/src/processing/app/helpers/CommandlineParser.java
@@ -63,6 +63,10 @@ public class CommandlineParser {
         action = a;
         continue;
       }
+      if (args[i].startsWith("-psn")) {
+        //discard
+        continue;
+      }
       if (args[i].equals("--verbose") || args[i].equals("-v")) {
         doVerboseBuild = true;
         doVerboseUpload = true;
diff --git a/build/build.xml b/build/build.xml
index d01441383..bf420bd91 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -248,30 +248,31 @@
 
   <target name="macosx-java-latest-build" if="macosx" depends="revision-check, macosx-checkos, subprojects-build" description="Build Mac OS X version">
     <antcall target="unzip">
-      <param name="archive_file" value="${staging_folder}/appbundler-1.0ea-arduino.jar.zip" />
-      <param name="archive_url" value="http://arduino.cc/download.php?f=/appbundler-1.0ea-arduino.jar.zip" />
-      <param name="final_folder" value="${staging_folder}/appbundler" />
-      <param name="dest_folder" value="${staging_folder}/appbundler" />
+      <param name="archive_file" value="${staging_folder}/appbundler-1.0ea-arduino2.jar.zip" />
+      <param name="archive_url" value="http://arduino.cc/download.php?f=/appbundler-1.0ea-arduino2.jar.zip" />
+      <param name="final_folder" value="${staging_folder}/appbundler-1.0ea-arduino2" />
+      <param name="dest_folder" value="${staging_folder}/appbundler-1.0ea-arduino2" />
     </antcall>
 
     <mkdir dir="${staging_folder}/work" />
 
-    <taskdef name="bundleapp" classname="com.oracle.appbundler.AppBundlerTask" classpath="${staging_folder}/appbundler/appbundler-1.0ea.jar"/>
+    <taskdef name="bundleapp" classname="com.oracle.appbundler.AppBundlerTask" classpath="${staging_folder}/appbundler-1.0ea-arduino2/appbundler-1.0ea-arduino2.jar"/>
 
-    <bundleapp outputDirectory="${staging_folder}/work"
-               name="Arduino"
-               displayName="Arduino"
-               executableName="Arduino"
-               identifier="cc.arduino.Arduino"
-               signature="Pde1"
-               icon="macosx/template.app/Contents/Resources/processing.icns"
-               copyright="Arduino LLC"
-               getInfo="${version}"
-               shortVersion="${version}"
-               version="${revision}"
-               mainClassName="processing.app.Base"
-               minimumsystem="10.7"
-               highresolutioncapable="true">
+    <bundleapp
+            jvmRequired="1.7"
+            outputdirectory="${staging_folder}/work"
+            name="Arduino"
+            displayname="Arduino"
+            executablename="Arduino"
+            identifier="cc.arduino.Arduino"
+            shortversion="${version}"
+            version="${revision}"
+            signature="Pde1"
+            icon="macosx/template.app/Contents/Resources/processing.icns"
+            mainclassname="processing.app.Base"
+            copyright="Arduino LLC"
+            minimumsystemversion="10.7"
+            highresolutioncapable="true">
 
       <arch name="x86_64"/>
       <arch name="i386"/>
@@ -295,7 +296,7 @@
       <!--<option value="-Dcom.apple.macos.useScreenMenuBar=true"/>-->
 
       <!-- Workaround since the icon parameter for bundleapp doesn't work -->
-      <option value="-Xdock:icon=Contents/Resources/processing.icns"/>
+      <option value="-Xdock:name=Arduino"/>
       <option value="-Dcom.apple.mrj.application.apple.menu.about.name=Arduino"/>
       <option value="-Dfile.encoding=UTF-8"/>
 
diff --git a/build/macosx/appbundler-1.0ea-arduino.jar.zip.sha b/build/macosx/appbundler-1.0ea-arduino.jar.zip.sha
deleted file mode 100644
index 44dd112b8..000000000
--- a/build/macosx/appbundler-1.0ea-arduino.jar.zip.sha
+++ /dev/null
@@ -1 +0,0 @@
-20da27cce14b7c60d6ef2e2cac2f60df491c8e21
diff --git a/build/macosx/appbundler-1.0ea-arduino2.jar.zip.sha b/build/macosx/appbundler-1.0ea-arduino2.jar.zip.sha
new file mode 100644
index 000000000..bcf3f61e6
--- /dev/null
+++ b/build/macosx/appbundler-1.0ea-arduino2.jar.zip.sha
@@ -0,0 +1 @@
+929bc65f3ba6ecb868254a6328f8502ad86fe4e5