diff --git a/build/build-7u40.xml b/build/build-7u40.xml
index 0636e96dd..73b45d858 100755
--- a/build/build-7u40.xml
+++ b/build/build-7u40.xml
@@ -414,9 +414,6 @@
     </copy>
     -->
 
-    <!-- if loading JRE directly from .tgz, it's in a folder called 
-	 jre1.7.0_40.jre, so we'll need to strip that out. -->
-
     <!-- workaround for apparent appbundler bug -->
     <copy todir=".">
       <fileset dir="macosx/template.app/Contents/Resources/" 
@@ -435,9 +432,13 @@
 	       version="Revision ${revision}"
 	       mainClassName="processing.app.Base">
 
-      <!-- Even though the JRE is a subfolder in this dir, 
-	   it seems to be what's picked up (vs the full JDK). -->
+      <!-- The appbundler task needs a couple files (the Info.plist and
+           anything else outside /jre) from the full JDK, even though 
+	   it's primarily copying over the JRE folder. -->
       <runtime dir="/Library/Java/JavaVirtualMachines/jdk1.7.0_40.jdk/Contents/Home" />
+      <!-- Eventually we'll want to load the JRE directly from 
+	   the .tgz on the Oracle site, though it's in a folder called 
+	   jre1.7.0_40.jre, so we'll need to strip that out. -->
 
       <!-- Same as runtime.jars, seen above; plus core.jar. -->
       <classpath file="../app/pde.jar" />
@@ -467,8 +468,8 @@
       </bundledocument>
 
       <!-- Workaround because the icon parameter for bundleapp doesn't work -->
-      <option value="-Xdock:icon=Contents/Resources/${bundle.icon}" />
-      <!--<option value="-Xdock:icon=Contents/Resources/processing.icns" />-->
+      <!--<option value="-Xdock:icon=Contents/Resources/${bundle.icon}" />-->
+      <option value="-Xdock:icon=Contents/Resources/processing.icns" />
       <!--<option value="-Xdock:icon=${bundle.icon}" />-->
       <!--<option value="-Xdock:icon=processing.icns" />-->
       <!-- this one actually works -->
@@ -504,8 +505,10 @@
       <option value="-Dcom.apple.mrj.application.apple.menu.about.name=${bundle.name}"/>
       <option value="-Dcom.apple.smallTabs=true"/>
 
+      <!-- Probably no longer needed? [fry 130917]
       <option value="-Xms128M" />
       <option value="-Xmx256M" />
+      -->
     </bundleapp>
 
     <!-- workaround for apparent appbundler bug -->
diff --git a/build/macosx/appbundler/.classpath b/build/macosx/appbundler/.classpath
new file mode 100644
index 000000000..74aba6a10
--- /dev/null
+++ b/build/macosx/appbundler/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/processing-app"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/build/macosx/appbundler/.project b/build/macosx/appbundler/.project
new file mode 100644
index 000000000..9e6f7c6d4
--- /dev/null
+++ b/build/macosx/appbundler/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>processing-appbundler</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/build/macosx/appbundler/.settings/org.eclipse.jdt.core.prefs b/build/macosx/appbundler/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 000000000..7341ab168
--- /dev/null
+++ b/build/macosx/appbundler/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,11 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/build/macosx/appbundler/src/com/oracle/appbundler/AppBundlerTask.java b/build/macosx/appbundler/src/com/oracle/appbundler/AppBundlerTask.java
index ef9121223..14f9e3022 100644
--- a/build/macosx/appbundler/src/com/oracle/appbundler/AppBundlerTask.java
+++ b/build/macosx/appbundler/src/com/oracle/appbundler/AppBundlerTask.java
@@ -48,6 +48,7 @@ import java.util.zip.ZipInputStream;
 import javax.xml.stream.XMLOutputFactory;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamWriter;
+import javax.xml.transform.OutputKeys;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.DirectoryScanner;
@@ -485,6 +486,8 @@ public class AppBundlerTask extends Task {
     private void writeInfoPlist(File file) throws IOException {
         Writer out = new BufferedWriter(new FileWriter(file));
         XMLOutputFactory output = XMLOutputFactory.newInstance();
+//        output.setProperty("indent-number", 2);
+        output.setProperty(OutputKeys.INDENT, "yes");
 
         try {
             XMLStreamWriter xout = output.createXMLStreamWriter(out);
@@ -535,11 +538,11 @@ public class AppBundlerTask extends Task {
                 writeProperty(xout, "JVMRuntime", runtime.getDir().getParentFile().getParentFile().getName());
             }
             
-            if ( privileged != null ) {
+            if (privileged != null) {
                 writeProperty(xout, "JVMRunPrivileged", privileged);
             }
             
-            if ( workingDirectory != null ) {
+            if (workingDirectory != null) {
                 writeProperty(xout, "WorkingDirectory", workingDirectory);
             }
 
@@ -553,20 +556,20 @@ public class AppBundlerTask extends Task {
             xout.writeStartElement(ARRAY_TAG);
             xout.writeCharacters("\n");
             
-            for(BundleDocument bundleDocument: bundleDocuments) {
+            for (BundleDocument bundleDocument: bundleDocuments) {
                 xout.writeStartElement(DICT_TAG);
                 xout.writeCharacters("\n");
                 
                 writeKey(xout, "CFBundleTypeExtensions");
                 xout.writeStartElement(ARRAY_TAG);
                 xout.writeCharacters("\n");
-                for(String extension : bundleDocument.getExtensions()) {
+                for (String extension : bundleDocument.getExtensions()) {
                     writeString(xout, extension);
                 }
                 xout.writeEndElement();
                 xout.writeCharacters("\n");
                 
-                if(bundleDocument.hasIcon()) {
+                if (bundleDocument.hasIcon()) {
                     writeKey(xout, "CFBundleTypeIconFile");
                     writeString(xout, bundleDocument.getIcon());
                 }
diff --git a/build/macosx/pde.icns b/build/macosx/pde.icns
new file mode 100644
index 000000000..214b19877
Binary files /dev/null and b/build/macosx/pde.icns differ
diff --git a/build/macosx/processing.icns b/build/macosx/processing.icns
new file mode 100644
index 000000000..901fc569e
Binary files /dev/null and b/build/macosx/processing.icns differ