diff --git a/build.xml b/build.xml
index 3b988895..ad38c01e 100644
--- a/build.xml
+++ b/build.xml
@@ -378,14 +378,6 @@
 	</target>
 
 
-	<target name="cask" description="Build Mac application bundle">
-		<tar destfile="${dir.dist}/${release}-darwin.tar.xz" compression="xz" longfile="posix" encoding="utf-8">
-			<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>
 
 
 	<target name="appbundle-maspkg-core">
diff --git a/installer/app/filebot.sh b/installer/app/filebot.sh
index c238c218..e4d7f1ee 100755
--- a/installer/app/filebot.sh
+++ b/installer/app/filebot.sh
@@ -16,5 +16,8 @@ done
 BIN=`dirname "$PRG"`
 APP_ROOT=`cd "$BIN/.." && pwd`
 
+JAVA_HOME="$APP_ROOT/PlugIns/jre-@{java.version}.jre/Contents/Home"
+LIBRARY_PATH="$APP_ROOT/MacOS"
+
 # launch filebot
-"$APP_ROOT"/PlugIns/*.jre/Contents/Home/bin/java @{java.application.options} -Dapplication.deployment=app -Djava.awt.headless=true -Dapple.awt.UIElement=true -Djna.boot.library.path="$APP_ROOT/MacOS" -Djna.library.path="$APP_ROOT/MacOS" -Djava.library.path="$APP_ROOT/MacOS" -Dnet.filebot.AcoustID.fpcalc="$APP_ROOT/MacOS/fpcalc" $JAVA_OPTS -classpath "$APP_ROOT/Java/*" net.filebot.Main "$@"
+"$JAVA_HOME/bin/java" @{java.application.options} -Dapplication.deployment=app -Djava.awt.headless=true -Dapple.awt.UIElement=true -Djna.boot.library.path="$LIBRARY_PATH" -Djna.library.path="$LIBRARY_PATH" -Djava.library.path="$LIBRARY_PATH" -Dnet.filebot.AcoustID.fpcalc="$LIBRARY_PATH/fpcalc" $JAVA_OPTS -classpath "$APP_ROOT/Java/*" net.filebot.Main "$@"
diff --git a/installer/cask/filebot.sh b/installer/cask/filebot.sh
deleted file mode 100755
index d30a1594..00000000
--- a/installer/cask/filebot.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-APP_EXE=`readlink /usr/local/bin/filebot`
-APP_ROOT=`dirname "$APP_EXE"`
-
-# start filebot
-/usr/libexec/java_home --failfast --version "@{jvm.version}+" --exec java @{java.application.options} -Dapplication.deployment=cask -Djava.awt.headless=true -Dapple.awt.UIElement=true -Djna.library.path="$APP_ROOT/lib" -Djava.library.path="$APP_ROOT/lib" -Dnet.filebot.AcoustID.fpcalc="$APP_ROOT/lib/fpcalc" $JAVA_OPTS -classpath "$APP_ROOT/*" @{main.class} "$@"