diff --git a/debian/changelog b/debian/changelog
index 04c69fe0..c552a566 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+livecd-rootfs (2.822) lunar; urgency=medium
+
+  [ jchittum ]
+  * riscv64: fix conditional check in install-grub to correctly check if
+    platform supports grub-efi-64, or exit func. (LP: #2015750)
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Mon, 10 Apr 2023 08:37:30 -0700
+
 livecd-rootfs (2.821) lunar; urgency=medium
 
   [ Chad Smith ]
diff --git a/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary b/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary
index cf4628d0..91e77516 100755
--- a/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary
+++ b/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary
@@ -455,7 +455,7 @@ EOF
 
             if [ "${SUBARCH:-}" != "nezha" ] && \
                [ "${SUBARCH:-}" != "licheerv" ] && \
-               [ "${SUBARCH:-}" != "icicle" ] \
+               [ "${SUBARCH:-}" != "icicle" ] && \
                [ "${SUBARCH:-}" != "visionfive" ] && \
                [ "${SUBARCH:-}" != "visionfive2" ]; then
                 ## TODO remove below once we have grub-efi-riscv64 for the platforms