diff --git a/alarm/raspberrypi-firmware/PKGBUILD b/alarm/raspberrypi-firmware/PKGBUILD
index 07c83212d..5fa6c8f6b 100644
--- a/alarm/raspberrypi-firmware/PKGBUILD
+++ b/alarm/raspberrypi-firmware/PKGBUILD
@@ -3,8 +3,7 @@ buildarch=18
 pkgbase=raspberrypi-firmware
 pkgname=('raspberrypi-firmware'
          'raspberrypi-firmware-bootloader'
-         'raspberrypi-firmware-bootloader-x'
-         'raspberrypi-firmware-emergency-kernel'
+         'raspberrypi-firmware-x'
          'raspberrypi-firmware-tools'
          'raspberrypi-firmware-examples')
 pkgver=20140324
@@ -36,7 +35,6 @@ build() {
 package_raspberrypi-firmware() {
   depends=('raspberrypi-firmware-bootloader'
            'raspberrypi-firmware-bootloader-x'
-           'raspberrypi-firmware-emergency-kernel'
            'raspberrypi-firmware-tools'
            'raspberrypi-firmware-examples')
 }
@@ -45,7 +43,7 @@ package_raspberrypi-firmware-bootloader() {
   pkgdesc="Bootloader files for Raspberry Pi"
 
   cp -R "${srcdir}"/firmware/boot "${pkgdir}"/boot
-  rm "${pkgdir}"/boot/{COPYING.linux,kernel*.img,start_x.elf,fixup_x.dat}
+  rm "${pkgdir}"/boot/{COPYING.linux,start_x.elf,fixup_x.dat}
 }
 
 package_raspberrypi-firmware-bootloader-x() {
@@ -56,13 +54,6 @@ package_raspberrypi-firmware-bootloader-x() {
   cp "${srcdir}"/firmware/boot/{start_x.elf,fixup_x.dat} "${pkgdir}"/boot
 }
 
-package_raspberrypi-firmware-emergency-kernel() {
-  pkgdesc="Emergency kernel for Raspberry Pi"
-
-  mkdir -p "${pkgdir}"/boot
-  cp "${srcdir}"/firmware/boot/{COPYING.linux,kernel*.img} "${pkgdir}"/boot
-}
-
 package_raspberrypi-firmware-tools() {
   pkgdesc="Firmware tools and header files for Raspberry Pi"