diff --git a/build/build.xml b/build/build.xml
index 49b73b483..c57d72010 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -301,7 +301,7 @@
       <option value="-Dfile.encoding=UTF-8"/>
 
       <option value="-Xms128M"/>
-      <option value="-Xmx256M"/>
+      <option value="-Xmx1024M"/>
 
       <bundledocument extensions="ino,c,cpp,h"
                       icon="macosx/template.app/Contents/Resources/pde.icns"
@@ -854,12 +854,12 @@
 
     <copy todir="windows/work">
       <fileset dir="windows/launcher"
-	       includes="about.bmp, application.ico, config.xml, config_debug.xml"/>
+	       includes="about.bmp, application.ico, config.xml, config_debug.xml, arduino.l4j.ini"/>
     </copy>
     <launch4j configFile="windows/work/config.xml" />
     <launch4j configFile="windows/work/config_debug.xml" />
-    <delete dir="windows/work"
-	    includes="about.bmp, application.ico, config.xml, config_debug.xml" />
+    <delete dir="windows/work" includes="about.bmp, application.ico, config.xml, config_debug.xml" />
+    <copy file="windows/work/arduino.l4j.ini" tofile="windows/work/arduino_debug.l4j.ini" />
 
     <!-- cygwin requires html, dll, and exe to have the +x flag -->
     <chmod perm="755">
diff --git a/build/macosx/template.app/Contents/Info.plist b/build/macosx/template.app/Contents/Info.plist
index 726fd700f..55f47f49a 100755
--- a/build/macosx/template.app/Contents/Info.plist
+++ b/build/macosx/template.app/Contents/Info.plist
@@ -81,7 +81,7 @@
       <key>VMOptions</key>
       <array>
         <string>-Xms128M</string>
-        <string>-Xmx256M</string>
+        <string>-Xmx1024M</string>
       </array>
 
       <key>MainClass</key>
diff --git a/build/windows/launcher/arduino.l4j.ini b/build/windows/launcher/arduino.l4j.ini
new file mode 100644
index 000000000..b0ef03811
--- /dev/null
+++ b/build/windows/launcher/arduino.l4j.ini
@@ -0,0 +1,2 @@
+-Xms128M
+-Xmx1024M
diff --git a/build/windows/launcher/config.xml b/build/windows/launcher/config.xml
index 3f427d040..ac30c38df 100644
--- a/build/windows/launcher/config.xml
+++ b/build/windows/launcher/config.xml
@@ -32,7 +32,6 @@
     <minVersion>1.6.0</minVersion>
     <maxVersion></maxVersion>
     <jdkPreference>preferJre</jdkPreference>
-    <opt>-Xms128m -Xmx128m</opt>
   </jre>
   <splash>
     <file>about.bmp</file>
diff --git a/build/windows/launcher/config_debug.xml b/build/windows/launcher/config_debug.xml
index 8af63a463..5675e7e16 100644
--- a/build/windows/launcher/config_debug.xml
+++ b/build/windows/launcher/config_debug.xml
@@ -32,7 +32,6 @@
     <minVersion>1.6.0</minVersion>
     <maxVersion></maxVersion>
     <jdkPreference>preferJre</jdkPreference>
-    <opt>-Xms128m -Xmx128m</opt>
   </jre>
   <messages>
     <startupErr>An error occurred while starting the application.</startupErr>