diff --git a/app.properties b/app.properties
index 3169150c..7e1b0bfe 100644
--- a/app.properties
+++ b/app.properties
@@ -68,7 +68,7 @@ mac.application.category: public.app-category.utilities
 deb.application.categories: AudioVideo;Video;Utility;FileTools;
 deb.application.mimetype: inode/directory;video/*;audio/*;text/*;application/*;
 deb.application.class: net-filebot-Main
-deb.application.depends: openjdk-11-jre, openjfx, xdg-utils, ffmpeg, mediainfo, libchromaprint-tools
+deb.application.depends: openjdk-11-jre, openjfx, mediainfo, libchromaprint-tools, p7zip-full, p7zip-rar
 
 # Package Options
 tar.compression: xz
diff --git a/build.xml b/build.xml
index 4d8bef5b..45630692 100644
--- a/build.xml
+++ b/build.xml
@@ -539,13 +539,10 @@
 		</copy-replace>
 
 		<jdeb destfile="${dir.dist}/${application.name}_${application.version}_amd64.deb" control="${dir.staging}/control" compression="${tar.compression}" verbose="true">
-			<tarfileset prefix="/usr/share/filebot/jre" dir="${dir.staging}/jre" includes="**/bin/**" filemode="755" />
-			<tarfileset prefix="/usr/share/filebot/jre" dir="${dir.staging}/jre" excludes="**/bin/**" />
-
 			<tarfileset prefix="/usr/share/filebot/bin" dir="${dir.staging}" includes="*.sh" filemode="755" />
 			<tarfileset prefix="/usr/share/filebot/jar" dir="${dir.dist}/lib" />
-			<tarfileset prefix="/usr/share/filebot/lib" dir="${dir.lib}/native/linux-amd64" includes="fpcalc" filemode="755" />
-			<tarfileset prefix="/usr/share/filebot/lib" dir="${dir.lib}/native/linux-amd64" includes="*.so" />
+
+			<tarfileset prefix="/usr/share/filebot/lib" dir="${dir.lib}/native/linux-amd64" includes="libjnidispatch.so" />
 
 			<tarfileset prefix="/usr/share/icons/hicolor/scalable/apps" dir="${dir.installer}/icons" includes="filebot.svg" />
 			<tarfileset prefix="/usr/share" dir="${dir.staging}/share" />
diff --git a/installer/deb/filebot.sh b/installer/deb/filebot.sh
index 9b48e614..748a3ecb 100644
--- a/installer/deb/filebot.sh
+++ b/installer/deb/filebot.sh
@@ -1,6 +1,5 @@
 #!/bin/sh
 FILEBOT_HOME="/usr/share/filebot"
-JAVA_HOME="$FILEBOT_HOME/jre"
 
 if [ -z "$HOME" ]; then
 	echo '$HOME must be set'
@@ -11,4 +10,4 @@ fi
 APP_DATA="$HOME/.filebot"
 LIBRARY_PATH="$FILEBOT_HOME/lib"
 
-"$JAVA_HOME/bin/java" -Dapplication.deployment=deb -Dnet.filebot.AcoustID.fpcalc="$LIBRARY_PATH/fpcalc" @{java.application.options} @{linux.application.options} @{linux.desktop.application.options} $JAVA_OPTS $FILEBOT_OPTS -jar "$FILEBOT_HOME/jar/filebot.jar" "$@"
+java -Dapplication.deployment=deb -Dnet.filebot.Archive.extractor=SevenZipExecutable @{java.application.options} @{linux.application.options} @{linux.desktop.application.options} $JAVA_OPTS $FILEBOT_OPTS -jar "$FILEBOT_HOME/jar/filebot.jar" "$@"