diff --git a/aur/ffmpeg-shinobi/PKGBUILD b/aur/ffmpeg-shinobi/PKGBUILD
index b524da3fc..c25b84a33 100644
--- a/aur/ffmpeg-shinobi/PKGBUILD
+++ b/aur/ffmpeg-shinobi/PKGBUILD
@@ -11,9 +11,9 @@ buildarch=28
 pkgname=ffmpeg-shinobi
 _pkgname=ffmpeg
 pkgver=4.3.2
-pkgrel=2
-pkgdesc='FFmpeg from the 4.3 release branch for use with Shinobi'
-arch=(x86_64 aarch64 armv6h armv7h)
+pkgrel=3
+pkgdesc='FFmpeg from the 4.3 release branch with hw accel decoding for use with Shinobi'
+arch=(aarch64 armv6h armv7h)
 url=https://ffmpeg.org/
 license=(GPL3)
 depends=(
@@ -111,6 +111,7 @@ _tag=f719f869907764e6412a6af6e178c46e5f915d25
 source=(
   git+https://git.ffmpeg.org/ffmpeg.git#tag=${_tag}
   vmaf-model-path.patch
+  try.patch
 )
 sha256sums=(
   SKIP
@@ -126,6 +127,7 @@ pkgver() {
 prepare() {
   cd ffmpeg
 
+  [[ $CARCH == "armv7h" || $CARCH == "aarch64" ]] && patch -Np1 -i ../try.patch
   patch -Np1 -i "${srcdir}"/vmaf-model-path.patch
 }
 
@@ -181,8 +183,6 @@ build() {
     --enable-version3
   )
 
-  [[ $CARCH == "x86_64" ]] && _args+=(--enable-libaom --enable-libmfx --enable-librav1e --enable-libvmaf --enable-nvdec --enable-nvenc)
-
   [[ $CARCH == "armv7h" || $CARCH == "aarch64" ]] && _args+=('--host-cflags="-fPIC"' --enable-librsvg)
   [[ $CARCH == "armv6h" || $CARCH == 'arm' ]] && _args+=('--extra-libs="-latomic"' --enable-librsvg)
 
diff --git a/core/linux-raspberrypi/PKGBUILD b/core/linux-raspberrypi/PKGBUILD
index a4470edda..1d0664c74 100644
--- a/core/linux-raspberrypi/PKGBUILD
+++ b/core/linux-raspberrypi/PKGBUILD
@@ -12,7 +12,7 @@ _srcname=linux-${_commit}
 _kernelname=${pkgbase#linux}
 _desc="Raspberry Pi 1 and 2"
 pkgver=5.10.63
-pkgrel=14
+pkgrel=15
 pkgdesc='Linux'
 url="http://www.kernel.org/"
 arch=(armv6h armv7h)
@@ -94,8 +94,11 @@ _package() {
   install -m644 ../$_bconfig "${pkgdir}/boot/config.txt"
   install -m644 ../cmdline.txt "${pkgdir}/boot"
 
-  [[ $CARCH == "armv6h" ]] && rm -f "${pkgdir}"/boot/bcm{2836,2837,2838,2709,2710,2711}*.dtb
-  [[ $CARCH == "armv7h" ]] && rm -f "${pkgdir}"/boot/bcm{2835,2838,2708,2711}*.dtb
+  if [[ $CARCH == "armv6h" ]]; then
+    rm -f "${pkgdir}"/boot/bcm{2836,2837,2838,2709,2710,2711}*.dtb
+  elif [[ $CARCH == "armv7h" ]]; then
+    rm -f "${pkgdir}"/boot/bcm{2835,2838,2708,2711}*.dtb
+  fi
 }
 
 _package-headers() {