diff --git a/edk2-build.py b/edk2-build.py
index c4bfbae..06249a5 100755
--- a/edk2-build.py
+++ b/edk2-build.py
@@ -108,7 +108,7 @@ def pcd_release_date():
 
 def build_message(line, line2 = None, silent = False):
     if os.environ.get('TERM') in [ 'xterm', 'xterm-256color' ]:
-        # setxterm  title
+        # set xterm title
         start  = '\x1b]2;'
         end    = '\x07'
         print(f'{start}{rebase_prefix}{line}{end}', end = '')
diff --git a/edk2-build.rhel-10 b/edk2-build.rhel-10
index 43279f6..ad8e6f7 100644
--- a/edk2-build.rhel-10
+++ b/edk2-build.rhel-10
@@ -73,7 +73,6 @@ plat = OvmfX64
 dest = RHEL-10/ovmf
 cpy1 = FV/OVMF_CODE.fd OVMF_CODE.fd
 cpy2 = FV/OVMF_VARS.fd
-cpy3 = X64/Shell.efi
 
 [build.ovmf.4m.sb.smm]
 desc = ovmf build (64-bit, 4MB, q35 only, needs smm, secure boot)
@@ -192,3 +191,31 @@ cpy3 = FV/RISCV_VIRT_VARS.fd
 cpy4 = FV/RISCV_VIRT_VARS.fd RISCV_VIRT_VARS.raw
 pad1 = RISCV_VIRT_CODE.raw 32m
 pad2 = RISCV_VIRT_VARS.raw 32m
+
+
+#####################################################################
+# standalone efi shell
+
+[build.shell.ovmf]
+desc = efi shell, x64
+conf = ShellPkg/ShellPkg.dsc
+arch = X64
+plat = Shell
+dest = RHEL-10/ovmf
+cpy1 = X64/Shell_EA4BB293-2D7F-4456-A681-1F22F42CD0BC.efi Shell.efi
+
+[build.shell.armvirt]
+desc = efi shell, aa64
+conf = ShellPkg/ShellPkg.dsc
+arch = AARCH64
+plat = Shell
+dest = RHEL-10/aarch64
+cpy1 = AARCH64/Shell_EA4BB293-2D7F-4456-A681-1F22F42CD0BC.efi Shell.efi
+
+[build.shell.riscv]
+desc = efi shell, riscv64
+conf = ShellPkg/ShellPkg.dsc
+arch = RISCV64
+plat = Shell
+dest = RHEL-10/riscv
+cpy1 = RISCV64/Shell_EA4BB293-2D7F-4456-A681-1F22F42CD0BC.efi Shell.efi
diff --git a/edk2.spec b/edk2.spec
index 58f3b29..1ef1c7b 100644
--- a/edk2.spec
+++ b/edk2.spec
@@ -25,7 +25,7 @@ ExclusiveArch: x86_64 aarch64 riscv64
 
 Name:       edk2
 Version:    %{GITDATE}
-Release:    6%{?dist}
+Release:    7%{?dist}
 Summary:    UEFI firmware for 64-bit virtual machines
 License:    BSD-2-Clause-Patent and Apache-2.0 and MIT
 URL:        http://www.tianocore.org
@@ -451,6 +451,7 @@ install -m 0644 \
 %{_datadir}/%{name}/aarch64/QEMU_EFI.qemuvars.fd
 %{_datadir}/%{name}/aarch64/QEMU_VARS.fd
 %{_datadir}/%{name}/aarch64/vars.*.json
+%{_datadir}/%{name}/aarch64/Shell.efi
 %{_datadir}/qemu/firmware/50-edk2-aarch64-qcow2.json
 %{_datadir}/qemu/firmware/51-edk2-aarch64-raw.json
 %{_datadir}/qemu/firmware/52-edk2-aarch64-verbose-qcow2.json
@@ -465,6 +466,7 @@ install -m 0644 \
 %common_files
 %{_datadir}/%{name}/riscv/*.fd
 %{_datadir}/%{name}/riscv/*.qcow2
+%{_datadir}/%{name}/riscv/Shell.efi
 %{_datadir}/qemu/firmware/50-edk2-riscv-qcow2.json
 %endif
 
@@ -493,6 +495,13 @@ install -m 0644 \
 
 
 %changelog
+* Tue Aug 18 2026 Miroslav Rezanina <mrezanin@redhat.com> - 20260221-7
+- edk2-update-efi-shell-build-config.patch [RHEL-235957]
+- edk2-fix-build-script-comment-typo.patch [RHEL-235957]
+- edk2-update-rpmspec-file-lists.patch [RHEL-235957]
+- Resolves: RHEL-235957
+  (add shell.efi to aarch64 sub-rpm)
+
 * Mon Aug 03 2026 Miroslav Rezanina <mrezanin@redhat.com> - 20260221-6
 - edk2-OvmfPkg-EmuVariableFvbRuntimeDxe-fix-ValidateFvHeade.patch [RHEL-220548]
 - Resolves: RHEL-220548