diff --git a/build.xml b/build.xml
index 40622eb6..334d8e2c 100644
--- a/build.xml
+++ b/build.xml
@@ -206,7 +206,7 @@
 		<copy tofile="${dir.dist}/appbundle/FileBot.jar" file="${path.fatjar}" />
 
 		<!-- build app bundle folder and add native libs -->
-		<jarbundler dir="${dir.dist}" name="${title}" version="${version}" build="${svn.revision}" icon="${dir.installer}/appbundle/icon.icns" bundleid="net.sourceforge.filebot" jar="${dir.dist}/appbundle/FileBot.jar" stubfile="${dir.installer}/appbundle/JavaApplicationStub" workingdirectory="$APP_PACKAGE/Contents/Resources/Java" mainclass="net.sourceforge.filebot.Main" jvmversion="1.6+" vmoptions="-Xmx256m">
+		<jarbundler dir="${dir.dist}" name="${title}" version="${version}" build="${svn.revision}" icon="${dir.installer}/appbundle/icon.icns" bundleid="net.sourceforge.filebot" jar="${dir.dist}/appbundle/FileBot.jar" stubfile="${dir.installer}/appbundle/JavaApplicationStub" workingdirectory="$APP_PACKAGE/Contents/Resources/Java" mainclass="net.sourceforge.filebot.Main" jvmversion="1.6+">
 			<javaproperty name="application.deployment" value="app" />
 			<javaproperty name="unixfs" value="false" />
 			<javaproperty name="useExtendedFileAttributes" value="true" />
diff --git a/installer/appbundle/filebot b/installer/appbundle/filebot
index 73220d7d..b3a5891f 100644
--- a/installer/appbundle/filebot
+++ b/installer/appbundle/filebot
@@ -4,4 +4,4 @@ while [ -h "$SOURCE" ] ; do SOURCE="$(readlink "$SOURCE")"; done
 dir_bin="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
 
 dir_app=$dir_bin/../Resources/Java
-java -Xmx256m -Djava.awt.headless=true -Dunixfs=false -DuseExtendedFileAttributes=true -Djava.net.useSystemProxies=true -Dsun.net.client.defaultConnectTimeout=10000 -Dsun.net.client.defaultReadTimeout=60000 -Dapplication.deployment=app "-Djna.library.path=$dir_app" "-Djava.library.path=$dir_app" -jar "$dir_app/FileBot.jar" "$@"
+java -Djava.awt.headless=true -Dunixfs=false -DuseExtendedFileAttributes=true -Djava.net.useSystemProxies=true -Dsun.net.client.defaultConnectTimeout=10000 -Dsun.net.client.defaultReadTimeout=60000 -Dapplication.deployment=app "-Djna.library.path=$dir_app" "-Djava.library.path=$dir_app" -jar "$dir_app/FileBot.jar" "$@"
diff --git a/installer/deb/filebot.sh b/installer/deb/filebot.sh
index 68243693..97c839ed 100644
--- a/installer/deb/filebot.sh
+++ b/installer/deb/filebot.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-java -Xmx256m -Dunixfs=false -DuseGVFS=true -DuseExtendedFileAttributes=true -Djava.net.useSystemProxies=true -Dsun.net.client.defaultConnectTimeout=10000 -Dsun.net.client.defaultReadTimeout=60000 -Dapplication.deployment=deb -Dapplication.analytics=true -Dapplication.warmup=true -Dapplication.dir=$HOME/.filebot -Djava.io.tmpdir=$HOME/.filebot/temp -Djna.library.path=/usr/share/filebot -Djava.library.path=/usr/share/filebot -jar /usr/share/filebot/FileBot.jar "$@"
+java -Dunixfs=false -DuseGVFS=true -DuseExtendedFileAttributes=true -Djava.net.useSystemProxies=true -Dsun.net.client.defaultConnectTimeout=10000 -Dsun.net.client.defaultReadTimeout=60000 -Dapplication.deployment=deb -Dapplication.analytics=true -Dapplication.warmup=true -Dapplication.dir=$HOME/.filebot -Djava.io.tmpdir=$HOME/.filebot/temp -Djna.library.path=/usr/share/filebot -Djava.library.path=/usr/share/filebot -jar /usr/share/filebot/FileBot.jar "$@"
diff --git a/installer/msi/filebot.launcher.l4j.ini b/installer/msi/filebot.launcher.l4j.ini
index 099b3a98..f38a2b4a 100644
--- a/installer/msi/filebot.launcher.l4j.ini
+++ b/installer/msi/filebot.launcher.l4j.ini
@@ -17,9 +17,6 @@
 # use NTFS extended attributes for storing metadata
 -DuseExtendedFileAttributes=true
 
-# memory settings
--Xmx256m
-
 # look for native libs here
 -Djna.library.path="%EXEDIR%"
 -Djava.library.path="%EXEDIR%"
diff --git a/installer/msi/filebot.platform.launcher.l4j.ini b/installer/msi/filebot.platform.launcher.l4j.ini
index 0ef72a8b..9b45e086 100644
--- a/installer/msi/filebot.platform.launcher.l4j.ini
+++ b/installer/msi/filebot.platform.launcher.l4j.ini
@@ -21,10 +21,6 @@
 # do not use NTFS extended attributes for storing metadata
 -DuseExtendedFileAttributes=false
 
-# memory settings
--Xms64m
--Xmx512m
-
 # look for native libs here
 -Djna.library.path="%EXEDIR%"
 -Djava.library.path="%EXEDIR%"
diff --git a/installer/portable/FileBot.l4j.ini b/installer/portable/FileBot.l4j.ini
index 8baf3cf6..f09504dc 100644
--- a/installer/portable/FileBot.l4j.ini
+++ b/installer/portable/FileBot.l4j.ini
@@ -18,9 +18,6 @@
 # do not use NTFS extended attributes for storing metadata
 -DuseExtendedFileAttributes=false
 
-# memory settings
--Xmx256m
-
 # put all temporary files here
 -Djava.io.tmpdir="%EXEDIR%/temp"
 
diff --git a/installer/portable/filebot.sh b/installer/portable/filebot.sh
index ecc9fbc6..85614494 100644
--- a/installer/portable/filebot.sh
+++ b/installer/portable/filebot.sh
@@ -6,4 +6,4 @@ dir_bin="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
 # force JVM language and encoding settings
 export LANG=en_US.utf8
 
-java -Xmx256m -Dunixfs=false -DuseGVFS=false -DuseExtendedFileAttributes=false -Djava.net.useSystemProxies=true -Dsun.net.client.defaultConnectTimeout=10000 -Dsun.net.client.defaultReadTimeout=60000 -Dapplication.deployment=portable -Dapplication.analytics=true -Dapplication.warmup=false "-Dapplication.dir=$dir_bin" "-Djava.io.tmpdir=$dir_bin/temp" "-Duser.home=$dir_bin" "-Djna.library.path=$dir_bin" "-Djava.library.path=$dir_bin" -Djava.util.prefs.PreferencesFactory=net.sourceforge.tuned.prefs.FilePreferencesFactory "-Dnet.sourceforge.tuned.prefs.file=$dir_bin/prefs.properties" -jar "$dir_bin/FileBot.jar" "$@"
+java -Dunixfs=false -DuseGVFS=false -DuseExtendedFileAttributes=false -Djava.net.useSystemProxies=true -Dsun.net.client.defaultConnectTimeout=10000 -Dsun.net.client.defaultReadTimeout=60000 -Dapplication.deployment=portable -Dapplication.analytics=true -Dapplication.warmup=false "-Dapplication.dir=$dir_bin" "-Djava.io.tmpdir=$dir_bin/temp" "-Duser.home=$dir_bin" "-Djna.library.path=$dir_bin" "-Djava.library.path=$dir_bin" -Djava.util.prefs.PreferencesFactory=net.sourceforge.tuned.prefs.FilePreferencesFactory "-Dnet.sourceforge.tuned.prefs.file=$dir_bin/prefs.properties" -jar "$dir_bin/FileBot.jar" "$@"
diff --git a/installer/ubuntu/filebot.sh b/installer/ubuntu/filebot.sh
index 7d04026d..d14dc0c8 100644
--- a/installer/ubuntu/filebot.sh
+++ b/installer/ubuntu/filebot.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-java -Xmx256m -Dunixfs=false -DuseGVFS=true -DuseExtendedFileAttributes=true -Djava.net.useSystemProxies=true -Dsun.net.client.defaultConnectTimeout=10000 -Dsun.net.client.defaultReadTimeout=60000 -Dapplication.update=skip -Dapplication.deployment=ppa -Dapplication.analytics=false -Dapplication.warmup=true -Dapplication.dir=$HOME/.filebot -Djava.io.tmpdir=$HOME/.filebot/temp -Djna.library.path=/opt/filebot -Djava.library.path=/opt/filebot -jar /opt/filebot/FileBot.jar "$@"
\ No newline at end of file
+java -Dunixfs=false -DuseGVFS=true -DuseExtendedFileAttributes=true -Djava.net.useSystemProxies=true -Dsun.net.client.defaultConnectTimeout=10000 -Dsun.net.client.defaultReadTimeout=60000 -Dapplication.update=skip -Dapplication.deployment=ppa -Dapplication.analytics=false -Dapplication.warmup=true -Dapplication.dir=$HOME/.filebot -Djava.io.tmpdir=$HOME/.filebot/temp -Djna.library.path=/opt/filebot -Djava.library.path=/opt/filebot -jar /opt/filebot/FileBot.jar "$@"
\ No newline at end of file
diff --git a/installer/webstart/filebot.jnlp b/installer/webstart/filebot.jnlp
index f2bc8523..62e37d99 100644
--- a/installer/webstart/filebot.jnlp
+++ b/installer/webstart/filebot.jnlp
@@ -33,7 +33,7 @@
 		<property name="sun.net.client.defaultReadTimeout"    value="60000" />
 		
 		
-		<java version="1.6+" max-heap-size="256m" />
+		<java version="1.6+" />
 		<property name="jnlp.packEnabled"       value="true" />
 		
 		<jar href="filebot.jar"       download="eager" main="true" />