diff --git a/alarm/raspberrypi-bootloader/PKGBUILD b/alarm/raspberrypi-bootloader/PKGBUILD
index ae37724a1..f532f350b 100644
--- a/alarm/raspberrypi-bootloader/PKGBUILD
+++ b/alarm/raspberrypi-bootloader/PKGBUILD
@@ -1,11 +1,9 @@
-# Maintainer: Kevin Mihelich <kevin@archlinuxarm.org>
 # Maintainer: graysky <graysky@archlinux.us>
+# Maintainer: Kevin Mihelich <kevin@archlinuxarm.org>
 
-pkgbase=raspberrypi-bootloader
-pkgname=('raspberrypi-bootloader'
-         'raspberrypi-bootloader-x')
+pkgname=raspberrypi-bootloader
 pkgver=20220207
-pkgrel=1
+pkgrel=2
 _commit=ad1c9ac829c43addd3da7476eecd8730a0089b32
 arch=('any')
 url="https://github.com/raspberrypi/firmware"
@@ -14,20 +12,11 @@ options=(!strip)
 source=("bootloader-$pkgver-${_commit:0:10}.tar.gz::https://github.com/raspberrypi/firmware/archive/${_commit}.tar.gz")
 md5sums=('fae14349f97d787881e1d266de0e7255')
 
-package_raspberrypi-bootloader() {
+package() {
   pkgdesc="Bootloader files for Raspberry Pi"
-  replaces=('raspberrypi-firmware-bootloader')
+  replaces=('raspberrypi-firmware-bootloader' 'raspberrypi-bootloader-x' 'raspberrypi-firmware-bootloader-x')
+  conflicts=('raspberrypi-bootloader-x')
 
   mkdir -p "${pkgdir}"/boot
   cp "${srcdir}"/firmware-${_commit}/boot/{*.dat,*.bin,*.elf} "${pkgdir}"/boot
-  rm "${pkgdir}"/boot/{start{_,4}x.elf,fixup{_,4}x.dat}
-}
-
-package_raspberrypi-bootloader-x() {
-  pkgdesc="Bootloader with extra codecs for Raspberry Pi"
-  depends=('raspberrypi-bootloader')
-  replaces=('raspberrypi-firmware-bootloader-x')
-
-  mkdir -p "${pkgdir}"/boot
-  cp "${srcdir}"/firmware-${_commit}/boot/{start{_,4}x.elf,fixup{_,4}x.dat} "${pkgdir}"/boot
 }