diff --git a/installer/snap/filebot/filebot.sh b/installer/snap/filebot/filebot.sh
deleted file mode 100755
index 9a282c68..00000000
--- a/installer/snap/filebot/filebot.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-export LANG="en_US.UTF-8"
-export LC_ALL="en_US.UTF-8"
-
-export JAVA_HOME="$SNAP/usr/lib/jvm/java-8-openjdk-$SNAP_ARCH"
-export PATH="$JAVA_HOME/jre/bin:$PATH"
-export LD_LIBRARY_PATH="$SNAP/usr/lib/filebot/$SNAP_ARCH:$LD_LIBRARY_PATH"
-
-export APP_DATA="$SNAP_USER_DATA/data"
-export APP_CACHE="$SNAP_USER_DATA/cache"
-export APP_PREFS="$SNAP_USER_DATA/prefs"
-
-java @{java.application.options} -Dapplication.deployment=snap -Dapplication.update=skip -Djava.library.path="$LD_LIBRARY_PATH" -Djna.library.path="$LD_LIBRARY_PATH" -Djna.boot.library.path="$SNAP/usr/lib/filebot/$SNAP_ARCH" -Dawt.useSystemAAFontSettings=on -Dswing.aatext=true -Dnet.filebot.UserFiles.fileChooser=JavaFX -DuseGVFS=true -Dnet.filebot.gio.GVFS="/run/user/$(id -u)/gvfs" -Duser.home="$SNAP_USER_DATA" -Dapplication.dir="$APP_DATA" -Dapplication.cache="$APP_CACHE/ehcache.disk.store" -Djava.io.tmpdir="$APP_CACHE/java.io.tmpdir" -Djava.util.prefs.userRoot="$APP_PREFS/user" -Djava.util.prefs.systemRoot="$APP_PREFS/system" -Dnet.filebot.AcoustID.fpcalc="$SNAP/usr/bin/fpcalc" $JAVA_OPTS -classpath "$SNAP/usr/lib/filebot/jar/*" @{main.class} "$@"
diff --git a/installer/snap/root/bin/filebot.sh b/installer/snap/root/bin/filebot.sh
new file mode 100755
index 00000000..364a0981
--- /dev/null
+++ b/installer/snap/root/bin/filebot.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+export LANG="en_US.UTF-8"
+export LC_ALL="en_US.UTF-8"
+
+export JAVA_HOME="$SNAP/usr/lib/jre"
+export PATH="$JAVA_HOME/jre/bin:$PATH"
+export LD_LIBRARY_PATH="$SNAP/usr/lib/filebot/lib:$LD_LIBRARY_PATH"
+
+export APP_DATA="$SNAP_USER_DATA/data"
+export APP_CACHE="$SNAP_USER_DATA/cache"
+export APP_PREFS="$SNAP_USER_DATA/prefs"
+
+"$JAVA_HOME/bin/java" @{java.application.options} -Dapplication.deployment=snap -Dapplication.update=skip -Djava.library.path="$LD_LIBRARY_PATH" -Djna.library.path="$LD_LIBRARY_PATH" -Djna.boot.library.path="$LD_LIBRARY_PATH" -Dawt.useSystemAAFontSettings=on -Dswing.aatext=true -Dnet.filebot.UserFiles.fileChooser=JavaFX -DuseGVFS=true -Dnet.filebot.gio.GVFS="/run/user/$(id -u)/gvfs" -Duser.home="$SNAP_USER_DATA" -Dapplication.dir="$APP_DATA" -Dapplication.cache="$APP_CACHE/ehcache.disk.store" -Djava.io.tmpdir="$APP_CACHE/java.io.tmpdir" -Djava.util.prefs.userRoot="$APP_PREFS/user" -Djava.util.prefs.systemRoot="$APP_PREFS/system" -Dnet.filebot.AcoustID.fpcalc="$SNAP/usr/bin/fpcalc" $JAVA_OPTS -classpath "$SNAP/usr/lib/filebot/jar/*" @{main.class} "$@"
diff --git a/installer/snap/snapcraft.yaml b/installer/snap/snapcraft.yaml
index 31f9d7e9..8d69ff33 100644
--- a/installer/snap/snapcraft.yaml
+++ b/installer/snap/snapcraft.yaml
@@ -10,13 +10,13 @@ architectures: [amd64]
 
 apps:
   filebot:
-    command: desktop-launch $SNAP/filebot.sh
+    command: desktop-launch $SNAP/bin/filebot.sh
     plugs: [unity7, opengl, x11, home, removable-media, network, network-bind, pulseaudio, gsettings]
 
 parts:
   filebot:
     plugin: dump
-    source: filebot
+    source: root
     stage-packages:
       - libmediainfo0v5
       - libchromaprint-tools