diff --git a/live-build/auto/config b/live-build/auto/config
index eb22a2ab..1b3a89e2 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -1097,6 +1097,9 @@ case $PROJECT in
 					arm64)
 						add_package ubuntu-server-minimal.ubuntu-server.installer.$flavor.netboot shim-signed
 						;;
+					riscv64)
+						add_package ubuntu-server-minimal.ubuntu-server.installer.$flavor.netboot grub-efi-riscv64 grub-efi-riscv64-unsigned
+						;;
 					*)
 						add_package ubuntu-server-minimal.ubuntu-server.installer.$flavor.netboot
 						;;
diff --git a/live-build/ubuntu-server/hooks/05-netboot-tarball.binary b/live-build/ubuntu-server/hooks/05-netboot-tarball.binary
index 9db81625..f76f7329 100755
--- a/live-build/ubuntu-server/hooks/05-netboot-tarball.binary
+++ b/live-build/ubuntu-server/hooks/05-netboot-tarball.binary
@@ -123,6 +123,19 @@ LABEL install
   kernel=linux.ubuntu
   initrd=initrd.ubuntu
   append=ip=dhcp iso-url=#ISOURL# ---
+EOF
+        ;;
+
+    riscv64)
+        mv chroot/usr/lib/grub/riscv64-efi/monolithic/grubnetriscv64.efi tarball/riscv64/grubriscv64.efi
+
+        mkdir tarball/riscv64/grub
+        cat > tarball/riscv64/grub/grub.cfg.in <<EOF
+menuentry "Install Ubuntu Server" {
+        set gfxpayload=keep
+        linux   linux iso-url=#ISOURL# ip=dhcp ---
+        initrd  initrd
+}
 EOF
         ;;
 esac