diff --git a/build.xml b/build.xml
index 91f9a746..5b457742 100644
--- a/build.xml
+++ b/build.xml
@@ -334,40 +334,12 @@
 	</target>
 
 
-	<target name="appbundle" description="Build Mac application bundle" depends="revision">
-		<bundleapp outputdirectory="${dir.dist}" executablename="filebot.launcher" hidedockicon="true" minimumsystemversion="${mac.version}" jvmrequired="${jvm.version}" name="${application.name}" displayname="${application.name} ${application.version}" version="${revision}" shortversion="${application.version}" identifier="${package.identifier}.Command" mainclassname="${main.class}" icon="${dir.installer}/appbundle/filebot.icns" copyright="${tstamp.year} ${package.developer}" applicationcategory="${mac.application.category}" highresolutioncapable="true" supportsautomaticgraphicsswitching="true" debug="false">
-			<classpath file="${path.fatjar}" />
-			<librarypath dir="${dir.lib}/native/mac-x86_64" />
-			<librarypath dir="${dir.installer}/appbundle/MacOS" />
-
-			<arch name="x86_64" />
-
-			<option value="-Dapplication.deployment=app" />
-			<option value="-Dapplication.update=auto" />
-			<option value="-Dunixfs=false" />
-			<option value="-DuseExtendedFileAttributes=true" />
-			<option value="-DuseCreationDate=false" />
-
-			<option value="-Djava.net.useSystemProxies=true" />
-			<option value="-Dfile.encoding=UTF-8" />
-
-			<option value="-Djna.nosys=true" />
-			<option value="-Djna.library.path=$APP_ROOT/Contents/MacOS" />
-			<option value="-Djava.library.path=$APP_ROOT/Contents/MacOS" />
-			<option value="-Dnet.filebot.AcoustID.fpcalc=$APP_ROOT/Contents/MacOS/fpcalc" />
-
-			<option value="-Xdock:name=${application.name}" />
-			<option value="-Xdock:icon=Contents/Resources/filebot.icns" />
-			<option value="-Dapple.laf.useScreenMenuBar=true" />
-		</bundleapp>
-
-		<!-- application bundle folder as tar -->
+	<target name="cask" description="Build Mac application bundle">
 		<tar destfile="${dir.dist}/${release}-darwin.tar.xz" compression="xz" longfile="posix" encoding="utf-8">
-			<tarfileset dir="${dir.dist}" includes="${application.name}.app/**" excludes="**/MacOS/**" />
-			<tarfileset dir="${dir.dist}" includes="${application.name}.app/**/**.dylib" />
-
-			<tarfileset dir="${dir.dist}" includes="${application.name}.app/**/fpcalc" filemode="755" />
-			<tarfileset dir="${dir.dist}" includes="${application.name}.app/**/**.sh" filemode="755" />
+			<tarfileset file="${path.fatjar}" fullpath="FileBot.jar" />
+			<tarfileset dir="${dir.installer}/cask" includes="*.sh" filemode="755" />
+			<tarfileset prefix="lib" dir="${dir.lib}/native/mac-x86_64" includes="fpcalc" filemode="755" />
+			<tarfileset prefix="lib" dir="${dir.lib}/native/mac-x86_64" includes="*.dylib" />
 		</tar>
 	</target>
 
@@ -865,7 +837,7 @@
 	</target>
 
 
-	<target name="stage-release" depends="fatjar, spk, portable, appbundle">
+	<target name="stage-release" depends="fatjar, spk, cask, portable">
 		<!-- ensure clean release dir -->
 		<delete dir="${dir.release}" />
 		<mkdir dir="${dir.release}" />
diff --git a/installer/appbundle/MacOS/filebot.sh b/installer/appbundle/MacOS/filebot.sh
deleted file mode 100755
index c4b227c9..00000000
--- a/installer/appbundle/MacOS/filebot.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-PRG="$0"
-
-# resolve relative symlinks
-while [ -h "$PRG" ] ; do
-	ls=`ls -ld "$PRG"`
-	link=`expr "$ls" : '.*-> \(.*\)$'`
-	if expr "$link" : '/.*' > /dev/null; then
-		PRG="$link"
-	else
-		PRG="`dirname "$PRG"`/$link"
-	fi
-done
-
-# get canonical path
-WORKING_DIR=`pwd`
-PRG_DIR=`dirname "$PRG"`
-APP_ROOT=`cd "$PRG_DIR/../.." && pwd`
-
-# restore original working dir
-cd "$WORKING_DIR"
-
-# start filebot
-/usr/libexec/java_home --failfast --version "1.8+" --exec java -Dunixfs=false -DuseExtendedFileAttributes=true -DuseCreationDate=false -Djava.net.useSystemProxies=true -Dapple.awt.UIElement=true -Djna.nounpack=true -Dapplication.deployment=app -Djna.library.path="$APP_ROOT/Contents/MacOS" -Djava.library.path="$APP_ROOT/Contents/MacOS" -Dnet.filebot.AcoustID.fpcalc="$APP_ROOT/Contents/MacOS/fpcalc" $JAVA_OPTS -jar "$APP_ROOT"/Contents/Java/*.jar "$@"
diff --git a/installer/cask/filebot.sh b/installer/cask/filebot.sh
new file mode 100755
index 00000000..c7ae44e0
--- /dev/null
+++ b/installer/cask/filebot.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+APP_EXE=`readlink /usr/local/bin/filebot`
+APP_ROOT=`dirname "$APP_EXE"`
+
+# start filebot
+/usr/libexec/java_home --failfast --version "9+" --exec java -Dunixfs=false -DuseExtendedFileAttributes=true -DuseCreationDate=false -Djava.net.useSystemProxies=true -Dapple.awt.UIElement=true -Djna.nounpack=true -Dapplication.deployment=cask -Djna.library.path="$APP_ROOT/lib" -Djava.library.path="$APP_ROOT/lib" -Dnet.filebot.AcoustID.fpcalc="$APP_ROOT/lib/fpcalc" $JAVA_OPTS -jar "$APP_ROOT/FileBot.jar" "$@"