diff --git a/app/src/processing/mode/java/JavaBuild.java b/app/src/processing/mode/java/JavaBuild.java
index 4991a3f61..a38cbea5b 100644
--- a/app/src/processing/mode/java/JavaBuild.java
+++ b/app/src/processing/mode/java/JavaBuild.java
@@ -1352,16 +1352,16 @@ public class JavaBuild {
       runOptions += " -Xmx" +
         Preferences.get("run.options.memory.maximum") + "m";
     }
-    if (exportPlatform == PConstants.MACOSX) {
-      // If no bits specified (libs are all universal, or no native libs)
-      // then exportBits will be 0, and can be controlled via "Get Info".
-      // Otherwise, need to specify the bits as a VM option.
-      if (exportBits == 32) {
-        runOptions += " -d32";
-      } else if (exportBits == 64) {
-        runOptions += " -d64";
-      }
-    }
+//    if (exportPlatform == PConstants.MACOSX) {
+//      // If no bits specified (libs are all universal, or no native libs)
+//      // then exportBits will be 0, and can be controlled via "Get Info".
+//      // Otherwise, need to specify the bits as a VM option.
+//      if (exportBits == 32) {
+//        runOptions += " -d32";
+//      } else if (exportBits == 64) {
+//        runOptions += " -d64";
+//      }      
+//    }
 
     /// macosx: write out Info.plist (template for classpath, etc)
 
@@ -1395,6 +1395,18 @@ public class JavaBuild {
             sb.replace(index, index + "@@lsuipresentationmode@@".length(),
                        Preferences.getBoolean("export.application.fullscreen") ? "4" : "0");
           }
+          while ((index = sb.indexOf("@@lsarchitecturepriority@@")) != -1) {
+            // More about this mess: http://support.apple.com/kb/TS2827
+            // First default to exportBits == 0 case
+            String arch = "<string>x86_64</string>\n      <string>i386</string>"; 
+            if (exportBits == 32) {
+              arch = "<string>i386</string>";
+            } else if (exportBits == 64) {
+              arch = "<string>x86_64</string>";
+            }
+            sb.replace(index, index + "@@lsarchitecturepriority@@".length(), arch);
+          }
+
           lines[i] = sb.toString();
         }
         // explicit newlines to avoid Windows CRLF
diff --git a/build/build.xml b/build/build.xml
index fd07bc28a..c7105d684 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -343,7 +343,6 @@
 	  tofile="macosx/work/Processing.app" />
 
     <chmod file="macosx/work/Processing.app/Contents/MacOS/JavaApplicationStub" perm="ugo+x" />
-    <chmod file="macosx/work/Processing.app/Contents/MacOS/JavaApplicationStub64" perm="ugo+x" />
     
     <copy todir="macosx/work/Processing.app/Contents/Resources/Java" flatten="true">
       <fileset refid="runtime.jars"/>
@@ -368,7 +367,6 @@
 
     <!-- The ant copy command does not preserve permissions. -->
     <chmod file="macosx/work/Processing.app/Contents/MacOS/JavaApplicationStub" perm="ugo+x" />
-    <chmod file="macosx/work/Processing.app/Contents/MacOS/JavaApplicationStub64" perm="ugo+x" />
 
     <replace file="macosx/work/Processing.app/Contents/Info.plist"
 	     token="VERSION" value="${version}" />
@@ -404,7 +402,6 @@
 
     <!-- The ant copy command does not preserve permissions. -->
     <chmod file="macosx/working_dir/Processing.app/Contents/MacOS/JavaApplicationStub" perm="ugo+x" />
-    <chmod file="macosx/working_dir/Processing.app/Contents/MacOS/JavaApplicationStub64" perm="ugo+x" />
 
     <!-- Pause briefly for the OS to catch up with the DMG changes. 
 	 This prevents "hdiutil: couldn't eject "disk3" - Resource busy"
diff --git a/build/macosx/template.app/Contents/MacOS/JavaApplicationStub b/build/macosx/template.app/Contents/MacOS/JavaApplicationStub
index 9ae8d5554..56ec300e5 100755
Binary files a/build/macosx/template.app/Contents/MacOS/JavaApplicationStub and b/build/macosx/template.app/Contents/MacOS/JavaApplicationStub differ
diff --git a/java/application/template.app/Contents/MacOS/JavaApplicationStub b/java/application/template.app/Contents/MacOS/JavaApplicationStub
index 9ae8d5554..56ec300e5 100755
Binary files a/java/application/template.app/Contents/MacOS/JavaApplicationStub and b/java/application/template.app/Contents/MacOS/JavaApplicationStub differ
diff --git a/java/application/template.app/Contents/MacOS/JavaApplicationStub64 b/java/application/template.app/Contents/MacOS/JavaApplicationStub64
deleted file mode 100755
index a8fbda5e2..000000000
Binary files a/java/application/template.app/Contents/MacOS/JavaApplicationStub64 and /dev/null differ
diff --git a/java/application/template.plist b/java/application/template.plist
index cbb988129..254530b4a 100755
--- a/java/application/template.plist
+++ b/java/application/template.plist
@@ -27,6 +27,11 @@
     <key>LSUIPresentationMode</key>
     <integer>@@lsuipresentationmode@@</integer>
 
+    <key>LSArchitecturePriority</key>
+    <array>
+      @@lsarchitecturepriority@@
+    </array>
+
     <key>Java</key>
     <dict>
       <key>VMOptions</key>