diff --git a/stand/efi/loader/bootinfo.c b/stand/efi/loader/bootinfo.c
index af0896a4606..a3c7fe1d493 100644
--- a/stand/efi/loader/bootinfo.c
+++ b/stand/efi/loader/bootinfo.c
@@ -271,7 +271,9 @@ efi_do_vmap(EFI_MEMORY_DESCRIPTOR *mm, UINTN sz, UINTN mmsz, UINT32 mmver)
 	viter = vmap;
 	for (curr = 0; curr < ndesc;
 	    curr++, desc = NextMemoryDescriptor(desc, mmsz)) {
-		if ((desc->Attribute & EFI_MEMORY_RUNTIME) != 0) {
+		if ((desc->Attribute & EFI_MEMORY_RUNTIME) != 0 ||
+		    desc->Type == EfiBootServicesCode ||
+		    desc->Type == EfiBootServicesData) {
 			++nset;
 			desc->VirtualStart = desc->PhysicalStart;
 			*viter = *desc;