diff --git a/alarm/vlc-rpi/PKGBUILD b/alarm/vlc-rpi/PKGBUILD
index c7ffff2a2..d2a6f7d43 100644
--- a/alarm/vlc-rpi/PKGBUILD
+++ b/alarm/vlc-rpi/PKGBUILD
@@ -4,18 +4,16 @@
 # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
 # Contributor: Martin Sandsmark <martin.sandsmark@kde.org>
 
-buildarch=8
-
 pkgname=vlc-rpi
 _pkgname=vlc
 _vlcver=3.0.21
 # optional fixup version including hyphen
 _vlcfixupver=
 pkgver=${_vlcver}${_vlcfixupver//-/.r}
-pkgrel=2
+pkgrel=3
 pkgdesc='Multi-platform MPEG, VCD/DVD, and DivX player with hw accel for RPi 3 and above'
 url='https://www.videolan.org/vlc/'
-arch=(aarch64)
+arch=(aarch64 armv7h)
 license=(
   'GPL-2.0-or-later'
   'LGPL-2.1-or-later'
@@ -64,7 +62,6 @@ depends=(
   'qt5-base'
   'qt5-svg'
   'qt5-x11extras'
-  'taglib'
   'wayland'
   'xcb-util-keysyms'
   'zlib'
@@ -132,6 +129,7 @@ makedepends=(
   'xosd'
   'zvbi'
 )
+makedepends_aarch64=('taglib')
 optdepends=(
   'aalib: ASCII art video output'
   'alsa-lib: ALSA audio output'
@@ -224,7 +222,7 @@ sha256sums=('24dbbe1d7dfaeea0994d5def0bbde200177347136dbfe573f5b6a4cee25afbb0'
             'b98043683dd90d3f5a3f501212dfc629839b661100de5ac79fd30cb7b4a06f13'
             'db41f3a11d4df28251f1baaf41bc0913227ff1e77680e43d7efa172e6ae1cc29'
             '61125ab0da600d813f1aebd8445fcf03e176389cfb8aa28591f8225a13043089'
-            'f7d129441b5f1f1ce03f7056ebe2707d8c431a69a11afe153a9990dd61ce75ec'
+            '48da04f8f649952b99320b955854498853141411050d6e5583b835a244644137'
             '753517a8b88c5950d516f0fe57a3ef169e0665ba7817d4b8d9976c666829a291'
             '616833e99372317d9a1e1a73254ee48f71a803eb13e8dd04db158e7c3db0eb5c')
 validpgpkeys=('65F7C6B4206BD057A7EB73787180713BE58D1ADC') # VideoLAN Release Signing Key
@@ -258,108 +256,115 @@ build() {
   export RCC=/usr/bin/rcc-qt5
   export PKG_CONFIG_PATH="/usr/lib/ffmpeg-rpi/pkgconfig/:$PKG_CONFIG_PATH"
 
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --with-kde-solid=/usr/share/solid/actions/ \
-    --disable-rpath \
-    --enable-omxil \
-    --enable-omxil-vout \
-    --enable-rpi-omxil \
-    --enable-gles2 \
-    --enable-nls \
-    --enable-archive \
-    --enable-live555 \
-    --enable-dc1394 \
-    --enable-dv1394 \
-    --enable-dvdread \
-    --enable-dvdnav \
-    --enable-bluray \
-    --disable-opencv \
-    --enable-smbclient \
-    --enable-sftp \
-    --enable-nfs \
-    --enable-realrtsp \
-    --enable-dvbpsi \
-    --enable-gme \
-    --enable-ogg \
-    --enable-shout \
-    --enable-matroska \
-    --enable-mod \
-    --enable-mpc \
-    --enable-mad \
-    --enable-mpg123 \
-    --enable-gst-decode \
-    --enable-avcodec \
-    --enable-libva \
-    --enable-avformat \
-    --enable-postproc \
-    --enable-faad \
-    --enable-vpx \
-    --enable-twolame \
-    --disable-fdkaac \
-    --enable-a52 \
-    --enable-dca \
-    --enable-flac \
-    --enable-fluidsynth \
-    --enable-libmpeg2 \
-    --enable-vorbis \
-    --enable-speex \
-    --enable-opus \
-    --enable-oggspots \
-    --disable-schroedinger \
-    --enable-png \
-    --enable-jpeg \
-    --enable-x264 \
-    --enable-x265 \
-    --enable-zvbi \
-    --enable-libass \
-    --enable-kate \
-    --enable-tiger \
-    --enable-vdpau \
-    --enable-wayland \
-    --enable-sdl-image \
-    --enable-freetype \
-    --enable-fribidi \
-    --enable-harfbuzz \
-    --enable-fontconfig \
-    --enable-svg \
-    --enable-svgdec \
-    --enable-aa \
-    --enable-caca \
-    --enable-pulse \
-    --enable-alsa \
-    --enable-jack \
-    --enable-samplerate \
-    --enable-soxr \
-    --disable-chromaprint \
-    --enable-chromecast \
-    --enable-qt \
-    --enable-skins2 \
-    --enable-libtar \
-    --enable-ncurses \
-    --enable-lirc \
-    --enable-goom \
-    --enable-projectm \
-    --enable-avahi \
-    --enable-mtp \
-    --enable-upnp \
-    --enable-microdns \
-    --enable-libxml2 \
-    --disable-libgcrypt \
-    --enable-gnutls \
-    --enable-taglib \
-    --enable-secret \
-    --enable-kwallet \
-    --disable-update-check \
-    --enable-notify \
-    --disable-libplacebo \
-    --enable-vlc \
-    --enable-aribsub \
-    --enable-aribcam \
-    --enable-aom \
-    --enable-srt \
+  _args=(
+    --prefix=/usr
+    --sysconfdir=/etc
+    --with-kde-solid=/usr/share/solid/actions/
+    --disable-rpath
+    --enable-omxil
+    --enable-omxil-vout
+    --enable-rpi-omxil
+    --enable-gles2
+    --enable-nls
+    --enable-archive
+    --enable-live555
+    --enable-dc1394
+    --enable-dv1394
+    --enable-dvdread
+    --enable-dvdnav
+    --enable-bluray
+    --disable-opencv
+    --enable-smbclient
+    --enable-sftp
+    --enable-nfs
+    --enable-realrtsp
+    --enable-dvbpsi
+    --enable-gme
+    --enable-ogg
+    --enable-shout
+    --enable-matroska
+    --enable-mod
+    --enable-mpc
+    --enable-mad
+    --enable-mpg123
+    --enable-gst-decode
+    --enable-avcodec
+    --enable-libva
+    --enable-avformat
+    --enable-postproc
+    --enable-faad
+    --enable-vpx
+    --enable-twolame
+    --disable-fdkaac
+    --enable-a52
+    --enable-dca
+    --enable-flac
+    --enable-fluidsynth
+    --enable-libmpeg2
+    --enable-vorbis
+    --enable-speex
+    --enable-opus
+    --enable-oggspots
+    --disable-schroedinger
+    --enable-png
+    --enable-jpeg
+    --enable-x264
+    --enable-x265
+    --enable-zvbi
+    --enable-libass
+    --enable-kate
+    --enable-tiger
+    --enable-vdpau
+    --enable-wayland
+    --enable-sdl-image
+    --enable-freetype
+    --enable-fribidi
+    --enable-harfbuzz
+    --enable-fontconfig
+    --enable-svg
+    --enable-svgdec
+    --enable-aa
+    --enable-caca
+    --enable-pulse
+    --enable-alsa
+    --enable-jack
+    --enable-samplerate
+    --enable-soxr
+    --disable-chromaprint
+    --enable-chromecast
+    --enable-qt
+    --enable-skins2
+    --enable-libtar
+    --enable-ncurses
+    --enable-lirc
+    --enable-goom
+    --enable-projectm
+    --enable-avahi
+    --enable-mtp
+    --enable-upnp
+    --enable-microdns
+    --enable-libxml2
+    --disable-libgcrypt
+    --enable-gnutls
+    --enable-secret
+    --enable-kwallet
+    --disable-update-check
+    --enable-notify
+    --disable-libplacebo
+    --enable-vlc
+    --enable-aribsub
+    --enable-aribcam
+    --enable-aom
+    --enable-srt
     --enable-dav1d
+)
+  if [[ $CARCH == "aarch64" ]]; then
+    _args+=( --enable-taglib )
+  elif [[ $CARCH == "armv7h" ]]; then
+    _args+=( --disable-taglib )
+  fi
+
+  ./configure "${_args[@]}"
 
   # prevent excessive overlinking due to libtool
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
diff --git a/alarm/vlc-rpi/vlc.config.txt b/alarm/vlc-rpi/vlc.config.txt
index 6c7be4329..b9fd57c7f 100644
--- a/alarm/vlc-rpi/vlc.config.txt
+++ b/alarm/vlc-rpi/vlc.config.txt
@@ -1,19 +1,17 @@
-dtoverlay=vc4-kms-v3d,cma-384
-
-[pi4]
 dtoverlay=vc4-kms-v3d,cma-512
-### RPi 4B/400 ONLY
-### For 4k content @ 60 Hz refresh rate, uncomment hdmi_enable_4kp60=1
-#hdmi_enable_4kp60=1
-
-[pi5]
-dtoverlay=vc4-kms-v3d,cma-512
-max_framebuffers=0
-
-[all]
 ### leave this next entry blank as ensures dt parameters like dtparam=audio=on
 ### which could appear after "include kodi.config.txt" in /boot/config.txt are
 ### applied to the base dt instead of to the last dtoverlay loaded
 dtoverlay=
 disable_overscan=1
 disable_fw_kms_setup=1
+display_auto_detect=1
+
+[pi4]
+### For 4k content @ 60 Hz refresh rate
+hdmi_enable_4kp60=1
+
+[pi5]
+max_framebuffers=0
+
+[all]