diff --git a/debian/changelog b/debian/changelog
index 78aeed08..193f6d24 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
 livecd-rootfs (2.509) UNRELEASED; urgency=medium
 
+  [ Steve Langasek ]
   * Properly handle loop device names when there are > 10 devices on the
     system.
 
+  [ Dimitri John Ledkov ]
+  * Build EFI armhf images.
+
  -- Steve Langasek <steve.langasek@ubuntu.com>  Tue, 06 Mar 2018 10:30:02 +0100
 
 livecd-rootfs (2.508) bionic; urgency=medium
diff --git a/live-build/ubuntu-cpc/hooks/032-disk-image.binary b/live-build/ubuntu-cpc/hooks/032-disk-image.binary
index 71db6d24..f7516dde 100755
--- a/live-build/ubuntu-cpc/hooks/032-disk-image.binary
+++ b/live-build/ubuntu-cpc/hooks/032-disk-image.binary
@@ -17,7 +17,7 @@ case $ARCH:$SUBARCH in
 		echo "POWER disk images are handled separately"
 		exit 0
 		;;
-	amd64|arm64)
+	amd64|arm64|armhf)
 		echo "We only create EFI images for $ARCH."
 		exit 0
 		;;
diff --git a/live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary b/live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary
index 1dece0a3..83cc466d 100755
--- a/live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary
+++ b/live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary
@@ -1,7 +1,7 @@
 #!/bin/bash -eux
 
 case $ARCH in
-    amd64|arm64)
+    amd64|arm64|armhf)
         ;;
     *)
         echo "We don't create EFI images for $ARCH."
@@ -20,7 +20,7 @@ create_partitions() {
     disk_image="$1"
     sgdisk "${disk_image}" --zap-all
     case $ARCH in
-        arm64)
+        arm64|armhf)
             sgdisk "${disk_image}" \
                 --new=15:0:204800 \
                 --typecode=15:ef00 \
@@ -83,6 +83,10 @@ install_grub() {
             chroot mountpoint apt-get -qqy install --no-install-recommends grub-efi-arm64 grub-efi-arm64-bin
             efi_target=arm64-efi
             ;;
+        armhf)
+            chroot mountpoint apt-get -qqy install --no-install-recommends grub-efi-arm grub-efi-arm-bin
+            efi_target=arm-efi
+            ;;
         amd64)
             chroot mountpoint apt-get install -qqy grub-efi-amd64-signed grub-efi-amd64 shim-signed
             efi_target=x86_64-efi