diff --git a/sys/boot/efi/libefi/elf_freebsd.c b/sys/boot/efi/libefi/elf_freebsd.c
index 1d99d72a653f..c98f93c5a692 100644
--- a/sys/boot/efi/libefi/elf_freebsd.c
+++ b/sys/boot/efi/libefi/elf_freebsd.c
@@ -148,20 +148,23 @@ elf_exec(struct preloaded_file *fp)
 		return(EFTYPE);			/* XXX actually EFUCKUP */
 	hdr = (Elf_Ehdr *)&(md->md_data);
 
-	printf("Entering %s at 0x%lx...\n", fp->f_name, hdr->e_entry);
+	status = BS->AllocatePages(AllocateAnyPages, EfiLoaderData,
+	    EFI_SIZE_TO_PAGES(sizeof(struct bootinfo)), (void*)&bi);
+	if (EFI_ERROR(status)) {
+		printf("unable to create bootinfo block (status=0x%lx)\n",
+		    (long)status);
+		return (ENOMEM);
+	}
 
-	/*
-	 * Ugly hack, similar to linux. Dump the bootinfo into a
-	 * special page reserved in the link map.
-	 */
-	bi = (struct bootinfo *) 0x508000;
 	bzero(bi, sizeof(struct bootinfo));
 	bi_load(bi, fp, &mapkey);
 
+	printf("Entering %s at 0x%lx...\n", fp->f_name, hdr->e_entry);
+
 	status = BS->ExitBootServices(IH, mapkey);
 	if (EFI_ERROR(status)) {
 		printf("ExitBootServices returned 0x%lx\n", status);
-		return;
+		return (EINVAL);
 	}
 
 	psr = disable_ic();
diff --git a/sys/boot/ia64/common/exec.c b/sys/boot/ia64/common/exec.c
index 1d99d72a653f..c98f93c5a692 100644
--- a/sys/boot/ia64/common/exec.c
+++ b/sys/boot/ia64/common/exec.c
@@ -148,20 +148,23 @@ elf_exec(struct preloaded_file *fp)
 		return(EFTYPE);			/* XXX actually EFUCKUP */
 	hdr = (Elf_Ehdr *)&(md->md_data);
 
-	printf("Entering %s at 0x%lx...\n", fp->f_name, hdr->e_entry);
+	status = BS->AllocatePages(AllocateAnyPages, EfiLoaderData,
+	    EFI_SIZE_TO_PAGES(sizeof(struct bootinfo)), (void*)&bi);
+	if (EFI_ERROR(status)) {
+		printf("unable to create bootinfo block (status=0x%lx)\n",
+		    (long)status);
+		return (ENOMEM);
+	}
 
-	/*
-	 * Ugly hack, similar to linux. Dump the bootinfo into a
-	 * special page reserved in the link map.
-	 */
-	bi = (struct bootinfo *) 0x508000;
 	bzero(bi, sizeof(struct bootinfo));
 	bi_load(bi, fp, &mapkey);
 
+	printf("Entering %s at 0x%lx...\n", fp->f_name, hdr->e_entry);
+
 	status = BS->ExitBootServices(IH, mapkey);
 	if (EFI_ERROR(status)) {
 		printf("ExitBootServices returned 0x%lx\n", status);
-		return;
+		return (EINVAL);
 	}
 
 	psr = disable_ic();