diff --git a/src/boot/memory.cpp b/src/boot/memory.cpp
index aa0ac45..ddb6d20 100644
--- a/src/boot/memory.cpp
+++ b/src/boot/memory.cpp
@@ -231,6 +231,11 @@ build_kernel_mem_map(kernel::args::header *args, uefi::boot_services *bs)
 		}
 	}
 
+	// Give just the actually-set entries in the header
+	args->mem_map = kernel_map;
+	args->num_map_entries = i;
+
+	// But pass the entire allocated area in a module as well
 	kernel::args::module &module = args->modules[args->num_modules++];
 	module.location = reinterpret_cast<void*>(kernel_map);
 	module.size = map_size;
diff --git a/src/include/kernel_args.h b/src/include/kernel_args.h
index c713b49..dcdedf9 100644
--- a/src/include/kernel_args.h
+++ b/src/include/kernel_args.h
@@ -80,6 +80,9 @@ struct header {
 	uint32_t num_modules;
 	module *modules;
 
+	mem_entry *mem_map;
+	size_t num_map_entries;
+
 	void *runtime_services;
 	void *acpi_table;
 }