@@ -2401,12 +2401,26 @@ static public File getContentFile(String name) {
   }
 
 
-//  static public File getJavaHome() {
-//  }
+  static public File getJavaHome() {
+    if (isMacOS()) {
+      //return "Contents/PlugIns/jdk1.7.0_40.jdk/Contents/Home/jre/bin/java";
+      File[] plugins = getContentFile("../PlugIns").listFiles(new FilenameFilter() {
+        public boolean accept(File dir, String name) {
+          return name.endsWith(".jdk") && dir.isDirectory();
+        }
+      });
+      return new File(plugins[0], "Contents/Home/jre");
+    } 
+    // On all other platforms, it's the 'java' folder adjacent to Processing
+    return getContentFile("java");
+  }
 
 
   /** Get the path to the embedded Java executable. */
   static public String getJavaPath() {
+    String javaPath = "bin/java" + (isWindows() ? ".exe" : "");
+    return new File(getJavaHome(), javaPath).getAbsolutePath();
+    /*
     if (isMacOS()) {
       //return "Contents/PlugIns/jdk1.7.0_40.jdk/Contents/Home/jre/bin/java";
       File[] plugins = getContentFile("../PlugIns").listFiles(new FilenameFilter() {
@@ -2429,6 +2443,7 @@ public boolean accept(File dir, String name) {
     System.err.println("No appropriate platform found. " +
                        "Hoping that Java is in the path.");
     return Base.isWindows() ? "java.exe" : "java";
+    */
   }
 
 
@@ -2569,6 +2584,7 @@ static public void copyFile(File sourceFile,
     to = null;
 
     targetFile.setLastModified(sourceFile.lastModified());
+    targetFile.setExecutable(sourceFile.canExecute());
   }
 
 
@@ -2639,6 +2655,28 @@ static public void copyDir(File sourceDir,
       }
     }
   }
+  
+  
+  static public void copyDirNative(File sourceDir,
+                                   File targetDir) throws IOException {
+    Process process = null;
+    if (Base.isMacOS() || Base.isLinux()) {
+      process = Runtime.getRuntime().exec(new String[] { 
+        "cp", "-a", sourceDir.getAbsolutePath(), targetDir.getAbsolutePath()
+      });
+    } else {
+      // TODO implement version that uses XCOPY here on Windows
+      throw new RuntimeException("Not yet implemented on Windows");
+    }
+    try {
+      int result = process.waitFor();
+      if (result != 0) {
+        throw new IOException("Error while copying (result " + result + ")");
+      }
+    } catch (InterruptedException e) {
+      e.printStackTrace();
+    }
+  }
 
 
   /**
 
@@ -1162,11 +1162,42 @@ protected boolean exportApplication(File destFolder,
     File dotAppFolder = null;
     if (exportPlatform == PConstants.MACOSX) {
       dotAppFolder = new File(destFolder, sketch.getName() + ".app");
-//      String APP_SKELETON = "skeleton.app";
-      //File dotAppSkeleton = new File(folder, APP_SKELETON);
-      File dotAppSkeleton = mode.getContentFile("application/template.app");
-      Base.copyDir(dotAppSkeleton, dotAppFolder);
 
+      File contentsOrig = new File(Base.getJavaHome(), "../../../../..");
+
+//      File dotAppSkeleton = mode.getContentFile("application/template.app");
+//      Base.copyDir(dotAppSkeleton, dotAppFolder);
+      File contentsFolder = new File(dotAppFolder, "Contents");
+      contentsFolder.mkdirs();
+
+      // Info.plist will be written later
+      
+      // set the jar folder to a different location than windows/linux
+      //jarFolder = new File(dotAppFolder, "Contents/Resources/Java");
+      jarFolder = new File(contentsFolder, "Java");
+
+      File macosFolder = new File(contentsFolder, "MacOS");
+      macosFolder.mkdirs();
+      Base.copyFile(new File(contentsOrig, "MacOS/Processing"), 
+                    new File(contentsFolder, "MacOS/" + sketch.getName()));
+      
+      File pkgInfo = new File(contentsFolder, "PkgInfo");
+      PrintWriter writer = PApplet.createWriter(pkgInfo);
+      writer.println("APPL????");
+      writer.flush();
+      writer.close();
+      
+      // Use faster(?) native copy here (also to do sym links)
+      Base.copyDirNative(new File(contentsOrig, "PlugIns"),
+                         new File(contentsFolder, "PlugIns"));
+      
+      File resourcesFolder = new File(contentsFolder, "Resources");
+      Base.copyDir(new File(contentsOrig, "Resources/en.lproj"), 
+                   new File(resourcesFolder, "en.lproj"));
+      Base.copyFile(mode.getContentFile("application/sketch.icns"),
+                    new File(resourcesFolder, "sketch.icns"));
+      
+      /*
       String stubName = "Contents/MacOS/JavaApplicationStub";
       // need to set the stub to executable
       // will work on osx or *nix, but just dies on windows, oh well..
@@ -1189,13 +1220,11 @@ protected boolean exportApplication(File destFolder,
         String stubPath = stubFile.getAbsolutePath();
         Runtime.getRuntime().exec(new String[] { "chmod", "+x", stubPath });
       }
-
-      // set the jar folder to a different location than windows/linux
-      jarFolder = new File(dotAppFolder, "Contents/Resources/Java");
+      */
     }
 
 
-    /// make the jar folder (windows and linux)
+    /// make the jar folder (all platforms)
 
     if (!jarFolder.exists()) jarFolder.mkdirs();
 
 
@@ -542,11 +542,11 @@
       <option value="-Xmx256M" />
       -->
 
-      <option value="-Dapple.laf.useScreenMenuBar=true"/>
-      <option value="-Dcom.apple.macos.use-file-dialog-packages=true"/>
-      <option value="-Dcom.apple.macos.useScreenMenuBar=true"/>
-      <option value="-Dcom.apple.mrj.application.apple.menu.about.name=${bundle.name}"/>
-      <option value="-Dcom.apple.smallTabs=true"/>
+      <option value="-Dapple.laf.useScreenMenuBar=true" />
+      <option value="-Dcom.apple.macos.use-file-dialog-packages=true" />
+      <option value="-Dcom.apple.macos.useScreenMenuBar=true" />
+      <option value="-Dcom.apple.mrj.application.apple.menu.about.name=${bundle.name}" />
+      <option value="-Dcom.apple.smallTabs=true" />
 
 <!--
     the old options; most of these are probably no longer useful