diff --git a/.SRCINFO b/.SRCINFO
index 48ebad69045f..01611e1e3c7e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,16 @@
 pkgbase = filebot
 	pkgdesc = The ultimate tool to rename TV/anime shows, download subtitles, and validate checksums.
 	pkgver = 4.7.7
-	pkgrel = 3
+	pkgrel = 4
 	url = http://filebot.sourceforge.net/
 	install = filebot.install
 	arch = i686
 	arch = x86_64
+	arch = arm
+	arch = armv6h
 	arch = armv7h
 	license = GPL
+	makedepends = unzip
 	depends = java-runtime>=8
 	depends = fontconfig
 	depends = chromaprint
@@ -15,20 +18,21 @@ pkgbase = filebot
 	optdepends = libmediainfo: Episode naming / Sublight usage
 	optdepends = java-p7zip-binding: Extract archives
 	optdepends = gvfs: gvfs backends
+	noextract = FileBot_4.7.7-portable.tar.xz
+	noextract = FileBot_4.7.5-portable.tar.xz
+	noextract = filebot-arch.sh
+	noextract = filebot.svg
+	noextract = filebot.desktop
 	source = http://downloads.sourceforge.net/project/filebot/filebot/FileBot_4.7.7/FileBot_4.7.7-portable.tar.xz
+	source = http://downloads.sourceforge.net/project/filebot/filebot/FileBot_4.7.5/FileBot_4.7.5-portable.tar.xz
 	source = filebot-arch.sh
 	source = filebot.svg
 	source = filebot.desktop
 	md5sums = 58d35910d5d164454c7840122a17dace
+	md5sums = 8fb4f6d1cc4a136c46e1d8bc416c6df5
 	md5sums = 3b51756c50a54447a5e6fb6c052e3453
 	md5sums = 04f46be047049448dba3f0de29fe192d
 	md5sums = f37edd0bba7570904d28ab1681c7a7f3
-	source_i686 = https://github.com/java-native-access/jna/raw/090b24870896dd719a5b5c6d2181ba0d4bb8d767/lib/native/linux-x86.jar
-	md5sums_i686 = 588794d32336fcc6029a7e6591265c79
-	source_x86_64 = https://github.com/java-native-access/jna/raw/3fa90d76f5c44523eaa619e68ad8ad81b5a0dc94/lib/native/linux-x86-64.jar
-	md5sums_x86_64 = 6e0b830e108ab05c8bdccd9902258882
-	source_armv7h = https://github.com/java-native-access/jna/raw/0547a9c3e24bd1219b54e92b3e38b14c477e21f8/lib/native/linux-arm.jar
-	md5sums_armv7h = 1c141c8ac6a659b3b593fece54270709
 
 pkgname = filebot
 
diff --git a/PKGBUILD b/PKGBUILD
index 8ac465e89f61..eab2a28e710d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,46 +5,55 @@
 
 pkgname=filebot
 pkgver=4.7.7
-pkgrel=3
+pkgrel=4
 pkgdesc="The ultimate tool to rename TV/anime shows, download subtitles, and validate checksums."
-arch=('i686' 'x86_64' 'armv7h')
+arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7h')
 url="http://filebot.sourceforge.net/"
 license=('GPL')
 install=$pkgname.install
 depends=('java-runtime>=8' 'fontconfig' 'chromaprint')
+makedepends=('unzip')
 
-[[ $CARCH == "i686" ]] && _intarch=x86
+[[ $CARCH == "i686" ]]   && _intarch=x86
 [[ $CARCH == "x86_64" ]] && _intarch=x86-64
+[[ $CARCH == "arm" ]]    && _intarch=arm
+[[ $CARCH == "armv6h" ]] && _intarch=arm
 [[ $CARCH == "armv7h" ]] && _intarch=arm
 
 source=(http://downloads.sourceforge.net/project/$pkgname/$pkgname/FileBot_$pkgver/FileBot_$pkgver-portable.tar.xz
+        http://downloads.sourceforge.net/project/$pkgname/$pkgname/FileBot_4.7.5/FileBot_4.7.5-portable.tar.xz
         $pkgname-arch.sh $pkgname.svg $pkgname.desktop)
-source_i686+=(https://github.com/java-native-access/jna/raw/090b24870896dd719a5b5c6d2181ba0d4bb8d767/lib/native/linux-x86.jar)
-source_x86_64+=(https://github.com/java-native-access/jna/raw/3fa90d76f5c44523eaa619e68ad8ad81b5a0dc94/lib/native/linux-x86-64.jar)
-source_armv7h+=(https://github.com/java-native-access/jna/raw/0547a9c3e24bd1219b54e92b3e38b14c477e21f8/lib/native/linux-arm.jar)
 
 md5sums=('58d35910d5d164454c7840122a17dace'
+         '8fb4f6d1cc4a136c46e1d8bc416c6df5'
          '3b51756c50a54447a5e6fb6c052e3453'
          '04f46be047049448dba3f0de29fe192d'
          'f37edd0bba7570904d28ab1681c7a7f3')
-md5sums_i686=('588794d32336fcc6029a7e6591265c79')
-md5sums_x86_64=('6e0b830e108ab05c8bdccd9902258882')
-md5sums_armv7h=('1c141c8ac6a659b3b593fece54270709')
 
-#noextract=(FileBot_$pkgver.jar)
 optdepends=('libzen: Support for additional subtitle search engines (Sublight)'
 	    'libmediainfo: Episode naming / Sublight usage'
 	    'java-p7zip-binding: Extract archives'
 	    'gvfs: gvfs backends')
 
+noextract=($(for i in ${source[@]}; do basename $i; done))
+
 build() {
   /bin/true
 }
 
+prepare() {
+  mkdir $pkgver
+  mkdir 4.7.5
+  tar -xJf ./FileBot_$pkgver-portable.tar.xz -C $pkgver
+  tar -xJf ./FileBot_4.7.5-portable.tar.xz -C 4.7.5
+  cd 4.7.5
+  unzip FileBot.jar 2>&1 >/dev/null
+}
+
 package() {
   cd "$srcdir"
-  install -Dm644 FileBot.jar "$pkgdir/usr/share/java/$pkgname/$pkgname.jar"
-  install -Dm644 libjnidispatch.so "$pkgdir/usr/share/java/$pkgname/libjnidispatch.so"
+  install -Dm644 $pkgver/FileBot.jar "$pkgdir/usr/share/java/$pkgname/$pkgname.jar"
+  install -Dm644 4.7.5/com/sun/jna/linux-$_intarch/libjnidispatch.so "$pkgdir/usr/share/java/$pkgname/libjnidispatch.so"
   install -Dm755 $pkgname-arch.sh "$pkgdir/usr/bin/$pkgname"
   install -Dm644 $pkgname.svg "$pkgdir/usr/share/pixmaps/$pkgname.svg"
   install -Dm644 $pkgname.desktop "$pkgdir/usr/share/applications/$pkgname.desktop"