diff --git a/stand/efi/loader/arch/arm64/ldscript.arm64 b/stand/efi/loader/arch/arm64/ldscript.arm64
index d0ed320a319c..c10448f4180e 100644
--- a/stand/efi/loader/arch/arm64/ldscript.arm64
+++ b/stand/efi/loader/arch/arm64/ldscript.arm64
@@ -1,86 +1,89 @@
 /* $FreeBSD$ */
 /*
 OUTPUT_FORMAT("elf64-aarch64-freebsd", "elf64-aarch64-freebsd", "elf64-aarch64-freebsd")
 */
 OUTPUT_ARCH(aarch64)
 ENTRY(_start)
 SECTIONS
 {
   /* Read-only sections, merged into text segment: */
   . = 0;
   ImageBase = .;
   .text		: {
     *(.peheader)
     *(.text .stub .text.* .gnu.linkonce.t.*)
     /* .gnu.warning sections are handled specially by elf32.em. */
     *(.gnu.warning)
     *(.plt)
   } =0xD4200000
-  . = ALIGN(16);
+  . = ALIGN(4096);
+  _etext = .;
+  __data_start = .;
   .data		: {
     *(.rodata .rodata.* .gnu.linkonce.r.*)
     *(.rodata1)
     *(.sdata2 .sdata2.* .gnu.linkonce.s2.*)
     *(.sbss2 .sbss2.* .gnu.linkonce.sb2.*)
     *(.opd)
     *(.data .data.* .gnu.linkonce.d.*)
     *(.data1)
     *(.plabel)
 
     . = ALIGN(16);
     __bss_start = .;
     *(.sbss .sbss.* .gnu.linkonce.sb.*)
     *(.scommon)
     *(.dynbss)
     *(.bss *.bss.*)
     *(COMMON)
     . = ALIGN(16);
     __bss_end = .;
   }
   . = ALIGN(16);
   set_Xcommand_set	: {
     __start_set_Xcommand_set = .;
     *(set_Xcommand_set)
     __stop_set_Xcommand_set = .;
   }
   set_Xficl_compile_set	: {
     __start_set_Xficl_compile_set = .;
     *(set_Xficl_compile_set)
     __stop_set_Xficl_compile_set = .;
   }
   . = ALIGN(16);
   __gp = .;
   .sdata	: {
     *(.got.plt .got)
     *(.sdata .sdata.* .gnu.linkonce.s.*)
     *(dynsbss)
     *(.scommon)
   }
   . = ALIGN(16);
   .dynamic	: { *(.dynamic) }
   . = ALIGN(16);
   .rela.dyn	: {
     *(.rela.text .rela.text.* .rela.gnu.linkonce.t.*)
     *(.rela.rodata .rela.rodata.* .rela.gnu.linkonce.r.*)
     *(.rela.data .rela.data.* .rela.gnu.linkonce.d.*)
     *(.rela.got)
     *(.rela.sdata .rela.sdata.* .rela.gnu.linkonce.s.*)
     *(.rela.sbss .rela.sbss.* .rela.gnu.linkonce.sb.*)
     *(.rela.sdata2 .rela.sdata2.* .rela.gnu.linkonce.s2.*)
     *(.rela.sbss2 .rela.sbss2.* .rela.gnu.linkonce.sb2.*)
     *(.rela.bss .rela.bss.* .rela.gnu.linkonce.b.*)
     *(.rela.plt)
     *(.relset_*)
     *(.rela.dyn .rela.dyn.*)
   }
   . = ALIGN(16);
   .reloc	: { *(.reloc) }
   . = ALIGN(16);
   .dynsym	: { *(.dynsym) }
   _edata = .;
+  __data_size = . - __data_start;
 
   /* Unused sections */
   .interp	: { *(.interp) }
   .dynstr	: { *(.dynstr) }
   .hash		: { *(.hash) }
 }
diff --git a/stand/efi/loader/arch/arm64/start.S b/stand/efi/loader/arch/arm64/start.S
index 675d4e153f36..0b8537fed30e 100644
--- a/stand/efi/loader/arch/arm64/start.S
+++ b/stand/efi/loader/arch/arm64/start.S
@@ -1,187 +1,191 @@
 /*-
  * Copyright (c) 2014 Andrew Turner
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
  * $FreeBSD$
  */
 
 /*
  * We need to be a PE32+ file for EFI. On some architectures we can use
  * objcopy to create the correct file, however on arm64 we need to do
  * it ourselves.
  */
 
 #define	IMAGE_FILE_MACHINE_ARM64	0xaa64
 
+#define	IMAGE_FILE_EXECUTABLE		0x0002
+
 #define	IMAGE_SCN_CNT_CODE		0x00000020
 #define	IMAGE_SCN_CNT_INITIALIZED_DATA	0x00000040
 #define	IMAGE_SCN_MEM_DISCARDABLE	0x02000000
 #define	IMAGE_SCN_MEM_EXECUTE		0x20000000
 #define	IMAGE_SCN_MEM_READ		0x40000000
+#define	IMAGE_SCN_MEM_WRITE		0x80000000
 
 	.section .peheader,"a"
 efi_start:
 	/* The MS-DOS Stub, only used to get the offset of the COFF header */
 	.ascii	"MZ"
 	.short	0
 	.space	0x38
 	.long	pe_sig - efi_start
 
 	/* The PE32 Signature. Needs to be 8-byte aligned */
 	.align	3
 pe_sig:
 	.ascii	"PE"
 	.short	0
 coff_head:
 	.short	IMAGE_FILE_MACHINE_ARM64	/* AArch64 file */
 	.short	2				/* 2 Sections */
 	.long	0				/* Timestamp */
 	.long	0				/* No symbol table */
 	.long	0				/* No symbols */
 	.short	section_table - optional_header	/* Optional header size */
-	.short	0	/* Characteristics TODO: Fill in */
+	.short	IMAGE_FILE_EXECUTABLE		/* Characteristics */
 
 optional_header:
 	.short	0x020b				/* PE32+ (64-bit addressing) */
 	.byte	0				/* Major linker version */
 	.byte	0				/* Minor linker version */
-	.long	_edata - _end_header		/* Code size */
-	.long	0				/* No initialized data */
+	.long	_etext - _end_header		/* Code size */
+	.long	__data_size			/* Initialized data size */
 	.long	0				/* No uninitialized data */
 	.long	_start - efi_start		/* Entry point */
 	.long	_end_header - efi_start		/* Start of code */
 
 optional_windows_header:
 	.quad	0				/* Image base */
-	.long	32				/* Section Alignment */
-	.long	8				/* File alignment */
+	.long	4096				/* Section Alignment */
+	.long	512				/* File alignment */
 	.short	0				/* Major OS version */
 	.short	0				/* Minor OS version */
 	.short	0				/* Major image version */
 	.short	0				/* Minor image version */
 	.short	0				/* Major subsystem version */
 	.short	0				/* Minor subsystem version */
 	.long	0				/* Win32 version */
 	.long	_edata - efi_start		/* Image size */
 	.long	_end_header - efi_start		/* Header size */
 	.long	0				/* Checksum */
 	.short	0xa				/* Subsystem (EFI app) */
 	.short	0				/* DLL Characteristics */
 	.quad	0				/* Stack reserve */
 	.quad	0				/* Stack commit */
 	.quad	0				/* Heap reserve */
 	.quad	0				/* Heap commit */
 	.long	0				/* Loader flags */
 	.long	6				/* Number of RVAs */
 
 	/* RVAs: */
 	.quad	0
 	.quad	0
 	.quad	0
 	.quad	0
 	.quad	0
 	.quad	0
 
 section_table:
-	/* We need a .reloc section for EFI */
-	.ascii	".reloc"
+	.ascii	".text"
+	.byte	0
 	.byte	0
 	.byte	0				/* Pad to 8 bytes */
-	.long	0				/* Virtual size */
-	.long	0				/* Virtual address */
-	.long	0				/* Size of raw data */
-	.long	0				/* Pointer to raw data */
+	.long	_etext - _end_header		/* Virtual size */
+	.long	_end_header - efi_start		/* Virtual address */
+	.long	_etext - _end_header		/* Size of raw data */
+	.long	_end_header - efi_start		/* Pointer to raw data */
 	.long	0				/* Pointer to relocations */
 	.long	0				/* Pointer to line numbers */
 	.short	0				/* Number of relocations */
 	.short	0				/* Number of line numbers */
-	.long	(IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ | \
-		 IMAGE_SCN_MEM_DISCARDABLE)	/* Characteristics */
+	.long	(IMAGE_SCN_CNT_CODE | IMAGE_SCN_MEM_EXECUTE | \
+		 IMAGE_SCN_MEM_READ)		/* Characteristics */
 
-	/* The contents of the loader */
-	.ascii	".text"
+	.ascii	".data"
 	.byte	0
 	.byte	0
 	.byte	0				/* Pad to 8 bytes */
-	.long	_edata - _end_header		/* Virtual size */
-	.long	_end_header - efi_start		/* Virtual address */
-	.long	_edata - _end_header		/* Size of raw data */
-	.long	_end_header - efi_start		/* Pointer to raw data */
+	.long	__data_size			/* Virtual size */
+	.long	__data_start - efi_start	/* Virtual address */
+	.long	__data_size			/* Size of raw data */
+	.long	__data_start - efi_start	/* Pointer to raw data */
 	.long	0				/* Pointer to relocations */
 	.long	0				/* Pointer to line numbers */
 	.short	0				/* Number of relocations */
 	.short	0				/* Number of line numbers */
-	.long	(IMAGE_SCN_CNT_CODE | IMAGE_SCN_MEM_EXECUTE | \
-		 IMAGE_SCN_MEM_READ)		/* Characteristics */
+	.long	(IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ | \
+		 IMAGE_SCN_MEM_WRITE)		/* Characteristics */
+
+	.align	12
 _end_header:
 
 	.text
 	.globl	_start
 _start:
 	/* Save the boot params to the stack */
 	stp	x0, x1, [sp, #-16]!
 
 	adrp	x0, __bss_start
 	add	x0, x0, :lo12:__bss_start
 	adrp	x1, __bss_end
 	add	x1, x1, :lo12:__bss_end
 
 	b 2f
 
 1:
 	stp	xzr, xzr, [x0], #16
 2:
 	cmp	x0, x1
 	b.lo	1b
 
 	adrp	x0, ImageBase
 	add	x0, x0, :lo12:ImageBase
 	adrp	x1, _DYNAMIC
 	add	x1, x1, :lo12:_DYNAMIC
 
 	bl	self_reloc
 
 	ldp	x0, x1, [sp], #16
 
 #ifndef EFI_BOOT1
 	/*
 	 * Load the stack to use. The default stack may be too small for
 	 * the lua loader.
 	 */
 	adrp	x2, initstack_end
 	add	x2, x2, :lo12:initstack_end
 	mov	sp, x2
 #endif
 
 	bl	efi_main
 
 1:	b	1b
 
 #ifndef EFI_BOOT1
 .bss
 	.align	4
 initstack:
 	.space	(64 * 1024)
 initstack_end:
 #endif