diff --git a/app.properties b/app.properties
index 1b3a8e9f..0cf86f50 100644
--- a/app.properties
+++ b/app.properties
@@ -69,6 +69,7 @@ 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, mediainfo, libchromaprint-tools, p7zip-full, p7zip-rar
+deb.jna.depends: libjnidispatch.so
 
 # Package Options
 tar.compression: xz
diff --git a/build.xml b/build.xml
index e98a141d..06d349ee 100644
--- a/build.xml
+++ b/build.xml
@@ -540,11 +540,14 @@
 			<fileset dir="${dir.installer}/deb" />
 		</copy-replace>
 
-		<jdeb destfile="${dir.dist}/${application.name}_${application.version}_amd64.deb" control="${dir.staging}/control" compression="${tar.compression}" verbose="true">
+		<jdeb destfile="${dir.dist}/${application.name}_${application.version}.deb" control="${dir.staging}/control" compression="${tar.compression}" verbose="true">
 			<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="libjnidispatch.so" />
+			<tarfileset prefix="lib/x86_64" dir="${dir.lib}/native/linux-amd64" includes="${deb.jna.depends}" />
+			<tarfileset prefix="lib/i686" dir="${dir.lib}/native/linux-i686" includes="${deb.jna.depends}" />
+			<tarfileset prefix="lib/aarch64" dir="${dir.lib}/native/linux-armv8" includes="${deb.jna.depends}" />
+			<tarfileset prefix="lib/armv7l" dir="${dir.lib}/native/linux-armv7l" includes="${deb.jna.depends}" />
 
 			<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/control/control b/installer/deb/control/control
index de8a18ad..4b7c92d7 100644
--- a/installer/deb/control/control
+++ b/installer/deb/control/control
@@ -1,6 +1,6 @@
 Package: @{package.name}
 Version: @{application.version}
-Architecture: amd64
+Architecture: all
 Maintainer: @{package.developer} <@{package.maintainer}>
 Description: @{package.synopsis}
  @{package.description}
diff --git a/installer/deb/filebot.sh b/installer/deb/filebot.sh
index 748a3ecb..e2dc3310 100644
--- a/installer/deb/filebot.sh
+++ b/installer/deb/filebot.sh
@@ -8,6 +8,6 @@ fi
 
 # select application data folder
 APP_DATA="$HOME/.filebot"
-LIBRARY_PATH="$FILEBOT_HOME/lib"
+LIBRARY_PATH="$FILEBOT_HOME/lib/$(uname -m)"
 
 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" "$@"