diff --git a/build.sh b/build.sh
new file mode 100644
index 0000000..cde2ead
--- /dev/null
+++ b/build.sh
@@ -0,0 +1,36 @@
+export MAKEOBJDIRPREFIX=/tank/emaste/obj
+#make buildenv TARGET=arm64
+
+CLEAN="-DNO_CLEAN -DNO_DEPEND"
+#CLEAN="-DNO_CLEAN"
+#SRCCONF="SRCCONF=/dev/null"
+MYPATH=$(cd $(dirname $0) && pwd -L)
+SRCCONF="SRCCONF=$MYPATH/src.conf"
+J=-j8
+ARGS="$J $CLEAN $SRCCONF"
+
+build()
+{
+#    make $ARGS kernel-toolchain TARGET=arm64
+
+#    make $ARGS _includes TARGET=arm64
+#    make $ARGS buildkernel MODULES_OVERRIDE= TARGET=arm64
+
+#    make -i $ARGS buildworld TARGET=arm64
+
+    #make -i $ARGS buildworld buildkernel TARGET=arm64
+    make $ARGS buildworld buildkernel TARGET=arm64
+#    make $ARGS buildkernel TARGET=arm64
+
+    ls -l $MAKEOBJDIRPREFIX/arm64.arm64/tank/emaste/src/freebsd-arm64/sys/GENERIC/kernel*
+}
+
+build_kernel()
+{
+    make $ARGS kernel-toolchain TARGET=arm64
+    make $ARGS _includes TARGET=arm64
+    make $ARGS buildkernel MODULES_OVERRIDE= TARGET=arm64
+}
+
+build 2>&1 | tee build.log
+#build_kernel 2>&1 | tee build.log
diff --git a/lib/csu/arm64/Makefile b/lib/csu/aarch64/Makefile
similarity index 100%
rename from lib/csu/arm64/Makefile
rename to lib/csu/aarch64/Makefile
diff --git a/lib/csu/arm64/crt1.c b/lib/csu/aarch64/crt1.c
similarity index 100%
rename from lib/csu/arm64/crt1.c
rename to lib/csu/aarch64/crt1.c
diff --git a/lib/csu/arm64/crti.S b/lib/csu/aarch64/crti.S
similarity index 100%
rename from lib/csu/arm64/crti.S
rename to lib/csu/aarch64/crti.S
diff --git a/lib/csu/arm64/crtn.S b/lib/csu/aarch64/crtn.S
similarity index 100%
rename from lib/csu/arm64/crtn.S
rename to lib/csu/aarch64/crtn.S
diff --git a/lib/libc/Makefile b/lib/libc/Makefile
index fa8ad1e..398dc54 100644
--- a/lib/libc/Makefile
+++ b/lib/libc/Makefile
@@ -79,8 +79,8 @@ NOASM=
 .include "${LIBC_SRCTOP}/net/Makefile.inc"
 .include "${LIBC_SRCTOP}/nls/Makefile.inc"
 .include "${LIBC_SRCTOP}/posix1e/Makefile.inc"
-.if ${LIBC_ARCH} != "amd64" && \
-    ${LIBC_ARCH} != "arm64" && \
+.if ${LIBC_ARCH} != "aarch64" && \
+    ${LIBC_ARCH} != "amd64" && \
     ${LIBC_ARCH} != "powerpc64" && \
     ${LIBC_ARCH} != "sparc64" && \
     ${MACHINE_ARCH:Mmipsn32*} == "" && \
diff --git a/lib/libc/arm64/Makefile.inc b/lib/libc/aarch64/Makefile.inc
similarity index 78%
rename from lib/libc/arm64/Makefile.inc
rename to lib/libc/aarch64/Makefile.inc
index 1277b89..5f17200 100644
--- a/lib/libc/arm64/Makefile.inc
+++ b/lib/libc/aarch64/Makefile.inc
@@ -6,4 +6,4 @@
 # Long double is quad precision
 GDTOASRCS+=strtorQ.c
 MDSRCS+=machdep_ldisQ.c
-SYM_MAPS+=${LIBC_SRCTOP}/arm64/Symbol.map
+SYM_MAPS+=${LIBC_SRCTOP}/aarch64/Symbol.map
diff --git a/lib/libc/arm64/SYS.h b/lib/libc/aarch64/SYS.h
similarity index 100%
rename from lib/libc/arm64/SYS.h
rename to lib/libc/aarch64/SYS.h
diff --git a/lib/libc/arm64/Symbol.map b/lib/libc/aarch64/Symbol.map
similarity index 100%
rename from lib/libc/arm64/Symbol.map
rename to lib/libc/aarch64/Symbol.map
diff --git a/lib/libc/arm64/_fpmath.h b/lib/libc/aarch64/_fpmath.h
similarity index 100%
rename from lib/libc/arm64/_fpmath.h
rename to lib/libc/aarch64/_fpmath.h
diff --git a/lib/libc/arm64/arith.h b/lib/libc/aarch64/arith.h
similarity index 100%
rename from lib/libc/arm64/arith.h
rename to lib/libc/aarch64/arith.h
diff --git a/lib/libc/arm64/gd_qnan.h b/lib/libc/aarch64/gd_qnan.h
similarity index 100%
rename from lib/libc/arm64/gd_qnan.h
rename to lib/libc/aarch64/gd_qnan.h
diff --git a/lib/libc/arm64/gen/Makefile.inc b/lib/libc/aarch64/gen/Makefile.inc
similarity index 100%
rename from lib/libc/arm64/gen/Makefile.inc
rename to lib/libc/aarch64/gen/Makefile.inc
diff --git a/lib/libc/arm64/gen/_set_tp.c b/lib/libc/aarch64/gen/_set_tp.c
similarity index 100%
rename from lib/libc/arm64/gen/_set_tp.c
rename to lib/libc/aarch64/gen/_set_tp.c
diff --git a/lib/libc/arm64/gen/_setjmp.S b/lib/libc/aarch64/gen/_setjmp.S
similarity index 100%
rename from lib/libc/arm64/gen/_setjmp.S
rename to lib/libc/aarch64/gen/_setjmp.S
diff --git a/lib/libc/arm64/gen/flt_rounds.c b/lib/libc/aarch64/gen/flt_rounds.c
similarity index 100%
rename from lib/libc/arm64/gen/flt_rounds.c
rename to lib/libc/aarch64/gen/flt_rounds.c
diff --git a/lib/libc/arm64/gen/setjmp.S b/lib/libc/aarch64/gen/setjmp.S
similarity index 100%
rename from lib/libc/arm64/gen/setjmp.S
rename to lib/libc/aarch64/gen/setjmp.S
diff --git a/lib/libc/arm64/gen/sigsetjmp.S b/lib/libc/aarch64/gen/sigsetjmp.S
similarity index 100%
rename from lib/libc/arm64/gen/sigsetjmp.S
rename to lib/libc/aarch64/gen/sigsetjmp.S
diff --git a/lib/libc/arm64/sys/Makefile.inc b/lib/libc/aarch64/sys/Makefile.inc
similarity index 100%
rename from lib/libc/arm64/sys/Makefile.inc
rename to lib/libc/aarch64/sys/Makefile.inc
diff --git a/lib/libc/arm64/sys/__vdso_gettc.c b/lib/libc/aarch64/sys/__vdso_gettc.c
similarity index 100%
rename from lib/libc/arm64/sys/__vdso_gettc.c
rename to lib/libc/aarch64/sys/__vdso_gettc.c
diff --git a/lib/libc/arm64/sys/brk.S b/lib/libc/aarch64/sys/brk.S
similarity index 100%
rename from lib/libc/arm64/sys/brk.S
rename to lib/libc/aarch64/sys/brk.S
diff --git a/lib/libc/arm64/sys/cerror.S b/lib/libc/aarch64/sys/cerror.S
similarity index 100%
rename from lib/libc/arm64/sys/cerror.S
rename to lib/libc/aarch64/sys/cerror.S
diff --git a/lib/libc/arm64/sys/pipe.S b/lib/libc/aarch64/sys/pipe.S
similarity index 100%
rename from lib/libc/arm64/sys/pipe.S
rename to lib/libc/aarch64/sys/pipe.S
diff --git a/lib/libc/arm64/sys/sbrk.S b/lib/libc/aarch64/sys/sbrk.S
similarity index 100%
rename from lib/libc/arm64/sys/sbrk.S
rename to lib/libc/aarch64/sys/sbrk.S
diff --git a/lib/libc/arm64/sys/shmat.S b/lib/libc/aarch64/sys/shmat.S
similarity index 100%
rename from lib/libc/arm64/sys/shmat.S
rename to lib/libc/aarch64/sys/shmat.S
diff --git a/lib/libc/arm64/sys/sigreturn.S b/lib/libc/aarch64/sys/sigreturn.S
similarity index 100%
rename from lib/libc/arm64/sys/sigreturn.S
rename to lib/libc/aarch64/sys/sigreturn.S
diff --git a/lib/libc/arm64/sys/syscall.S b/lib/libc/aarch64/sys/syscall.S
similarity index 100%
rename from lib/libc/arm64/sys/syscall.S
rename to lib/libc/aarch64/sys/syscall.S
diff --git a/lib/libc/arm64/sys/vfork.S b/lib/libc/aarch64/sys/vfork.S
similarity index 100%
rename from lib/libc/arm64/sys/vfork.S
rename to lib/libc/aarch64/sys/vfork.S
diff --git a/lib/libcompiler_rt/Makefile b/lib/libcompiler_rt/Makefile
index 9924d52..73beda4 100644
--- a/lib/libcompiler_rt/Makefile
+++ b/lib/libcompiler_rt/Makefile
@@ -194,7 +194,7 @@ SRCS+=	${file}.c
 . endif
 .endfor
 
-.if ${MACHINE_CPUARCH} == "arm64"
+.if ${MACHINE_CPUARCH} == "aarch64"
 # These files live in the ppc directory so we can't include them using
 # SRCF above. We also need to adjust the path to add them.
 .PATH: ${CRTSRC}/ppc
diff --git a/lib/libkvm/Makefile b/lib/libkvm/Makefile
index 5949927..4608254 100644
--- a/lib/libkvm/Makefile
+++ b/lib/libkvm/Makefile
@@ -3,7 +3,7 @@
 
 .if defined(TARGET_ARCH) && !defined(COMPAT_32BIT)
 KVM_XARCH=${TARGET_ARCH}
-KVM_XCPUARCH=${KVM_XARCH:C/mips(n32|64)?(el)?/mips/:C/arm(v6)?(eb|hf)?/arm/:C/powerpc64/powerpc/:C/aarch64/arm64/}
+KVM_XCPUARCH=${KVM_XARCH:C/mips(n32|64)?(el)?/mips/:C/arm(v6)?(eb|hf)?/arm/:C/powerpc64/powerpc/}
 .else
 KVM_XARCH=${MACHINE_ARCH}
 KVM_XCPUARCH=${MACHINE_CPUARCH}
diff --git a/lib/libkvm/kvm_arm64.c b/lib/libkvm/kvm_aarch64.c
similarity index 100%
rename from lib/libkvm/kvm_arm64.c
rename to lib/libkvm/kvm_aarch64.c
diff --git a/lib/libstand/Makefile b/lib/libstand/Makefile
index e28c06e..7c6d718 100644
--- a/lib/libstand/Makefile
+++ b/lib/libstand/Makefile
@@ -39,7 +39,7 @@ CFLAGS+=	-msoft-float -D_STANDALONE -DNETIF_DEBUG
 .if ${MACHINE_CPUARCH} == "arm"
 CFLAGS+=	-msoft-float -D_STANDALONE
 .endif
-.if ${MACHINE_CPUARCH} == "arm64"
+.if ${MACHINE_CPUARCH} == "aarch64"
 CFLAGS+=	-D_STANDALONE -mgeneral-regs-only
 .endif
 .if ${MACHINE_CPUARCH} == "mips"
@@ -80,8 +80,8 @@ SRCS+=	aeabi_idivmod.S aeabi_ldivmod.S aeabi_uidivmod.S aeabi_uldivmod.S
 SRCS+=	aeabi_memcmp.S aeabi_memcpy.S aeabi_memmove.S aeabi_memset.S
 .endif
 
-.if ${MACHINE_CPUARCH} == "arm64"
-.PATH: ${.CURDIR}/../libc/arm64/gen
+.if ${MACHINE_CPUARCH} == "aarch64"
+.PATH: ${.CURDIR}/../libc/aarch64/gen
 .endif
 
 .if ${MACHINE_CPUARCH} == "powerpc"
diff --git a/lib/libthr/arch/arm64/Makefile.inc b/lib/libthr/arch/aarch64/Makefile.inc
similarity index 100%
rename from lib/libthr/arch/arm64/Makefile.inc
rename to lib/libthr/arch/aarch64/Makefile.inc
diff --git a/lib/libthr/arch/arm64/include/pthread_md.h b/lib/libthr/arch/aarch64/include/pthread_md.h
similarity index 100%
rename from lib/libthr/arch/arm64/include/pthread_md.h
rename to lib/libthr/arch/aarch64/include/pthread_md.h
diff --git a/lib/libthread_db/arch/arm64/libpthread_md.c b/lib/libthread_db/arch/aarch64/libpthread_md.c
similarity index 100%
rename from lib/libthread_db/arch/arm64/libpthread_md.c
rename to lib/libthread_db/arch/aarch64/libpthread_md.c
diff --git a/lib/msun/arm64/Makefile.inc b/lib/msun/aarch64/Makefile.inc
similarity index 100%
rename from lib/msun/arm64/Makefile.inc
rename to lib/msun/aarch64/Makefile.inc
diff --git a/lib/msun/arm64/fenv.c b/lib/msun/aarch64/fenv.c
similarity index 100%
rename from lib/msun/arm64/fenv.c
rename to lib/msun/aarch64/fenv.c
diff --git a/lib/msun/arm64/fenv.h b/lib/msun/aarch64/fenv.h
similarity index 100%
rename from lib/msun/arm64/fenv.h
rename to lib/msun/aarch64/fenv.h
diff --git a/libexec/rtld-elf/arm64/reloc.c b/libexec/rtld-elf/aarch64/reloc.c
similarity index 100%
rename from libexec/rtld-elf/arm64/reloc.c
rename to libexec/rtld-elf/aarch64/reloc.c
diff --git a/libexec/rtld-elf/arm64/rtld_machdep.h b/libexec/rtld-elf/aarch64/rtld_machdep.h
similarity index 100%
rename from libexec/rtld-elf/arm64/rtld_machdep.h
rename to libexec/rtld-elf/aarch64/rtld_machdep.h
diff --git a/libexec/rtld-elf/arm64/rtld_start.S b/libexec/rtld-elf/aarch64/rtld_start.S
similarity index 100%
rename from libexec/rtld-elf/arm64/rtld_start.S
rename to libexec/rtld-elf/aarch64/rtld_start.S
diff --git a/secure/lib/libcrypto/opensslconf-arm64.h b/secure/lib/libcrypto/opensslconf-aarch64.h
similarity index 100%
rename from secure/lib/libcrypto/opensslconf-arm64.h
rename to secure/lib/libcrypto/opensslconf-aarch64.h
diff --git a/share/mk/sys.mk b/share/mk/sys.mk
index eb6cce6..0fca510 100644
--- a/share/mk/sys.mk
+++ b/share/mk/sys.mk
@@ -13,7 +13,7 @@ unix		?=	We run FreeBSD, not UNIX.
 # and/or endian.  This is called MACHINE_CPU in NetBSD, but that's used
 # for something different in FreeBSD.
 #
-MACHINE_CPUARCH=${MACHINE_ARCH:C/mips(n32|64)?(el)?/mips/:C/arm(v6)?(eb|hf)?/arm/:C/powerpc64/powerpc/:C/aarch64/arm64/}
+MACHINE_CPUARCH=${MACHINE_ARCH:C/mips(n32|64)?(el)?/mips/:C/arm(v6)?(eb|hf)?/arm/:C/powerpc64/powerpc/}
 .endif
 
 # If the special target .POSIX appears (without prerequisites or
diff --git a/src.conf b/src.conf
new file mode 100644
index 0000000..7f98514
--- /dev/null
+++ b/src.conf
@@ -0,0 +1,3 @@
+#WITHOUT_SSP=yes
+
+MODULES_OVERRIDE=
\ No newline at end of file
diff --git a/sys/arm64/include/endian.h b/sys/arm64/include/endian.h
index bae3d80b..df98e90 100644
--- a/sys/arm64/include/endian.h
+++ b/sys/arm64/include/endian.h
@@ -43,7 +43,11 @@
 #define _BIG_ENDIAN     4321    /* MSB first: 68000, ibm, net */
 #define _PDP_ENDIAN     3412    /* LSB first in word, MSW first in long */
 
+#ifdef __ARMEB__
+#define _BYTE_ORDER	_BIG_ENDIAN
+#else
 #define	_BYTE_ORDER	_LITTLE_ENDIAN
+#endif /* __ARMEB__ */
 
 #if __BSD_VISIBLE
 #define LITTLE_ENDIAN   _LITTLE_ENDIAN
@@ -52,12 +56,21 @@
 #define BYTE_ORDER      _BYTE_ORDER
 #endif
 
+#ifdef __ARMEB__
+#define _QUAD_HIGHWORD 0
+#define _QUAD_LOWWORD 1
+#define __ntohl(x)	((__uint32_t)(x))
+#define __ntohs(x)	((__uint16_t)(x))
+#define __htonl(x)	((__uint32_t)(x))
+#define __htons(x)	((__uint16_t)(x))
+#else
 #define _QUAD_HIGHWORD  1
 #define _QUAD_LOWWORD 0
 #define __ntohl(x)        (__bswap32(x))
 #define __ntohs(x)        (__bswap16(x))
 #define __htonl(x)        (__bswap32(x))
 #define __htons(x)        (__bswap16(x))
+#endif /* __ARMEB__ */
 
 static __inline __uint64_t
 __bswap64(__uint64_t x)
diff --git a/sys/arm64/include/exec.h b/sys/arm64/include/exec.h
index d906792..c0f93b6 100644
--- a/sys/arm64/include/exec.h
+++ b/sys/arm64/include/exec.h
@@ -29,4 +29,6 @@
 #ifndef	_MACHINE_EXEC_H_
 #define	_MACHINE_EXEC_H_
 
+#define	__LDPGSZ	8192
+
 #endif /* !_MACHINE_EXEC_H_ */
diff --git a/sys/arm64/include/vmparam.h b/sys/arm64/include/vmparam.h
index 295399bb..91ff37e 100644
--- a/sys/arm64/include/vmparam.h
+++ b/sys/arm64/include/vmparam.h
@@ -145,10 +145,20 @@
  * 64 bit address space, mostly just for convenience.
  *
  * VM_MIN_KERNEL_ADDRESS and VM_MAX_KERNEL_ADDRESS define the start and end of
- * mappable kernel virtual address space.
+ * mappable kernel virtual address space.  VM_MIN_KERNEL_ADDRESS is basically
+ * arbitrary, a convenient address is chosen which allows both the kernel text
+ * and data and the prom's address space to be mapped with 1 4mb tsb page.
+ * VM_MAX_KERNEL_ADDRESS is variable, computed at startup time based on the
+ * amount of physical memory available.  Each 4mb tsb page provides 1g of
+ * virtual address space, with the only practical limit being available
+ * phsyical memory.
  *
  * VM_MIN_USER_ADDRESS and VM_MAX_USER_ADDRESS define the start and end of the
- * user address space.
+ * user address space.  There are some hardware errata about using addresses
+ * at the boundary of the va hole, so we allow just under 43 bits of user
+ * address space.  Note that the kernel and user address spaces overlap, but
+ * this doesn't matter because they use different tlb contexts, and because
+ * the kernel address space is not mapped into each process' address space.
  */
 #define	VM_MIN_ADDRESS		(0x0000000000000000UL)
 #define	VM_MAX_ADDRESS		(0xffffffffffffffffUL)
diff --git a/sys/boot/arm64/efi/Makefile b/sys/boot/arm64/efi/Makefile
index 98e708e..4e6f147 100644
--- a/sys/boot/arm64/efi/Makefile
+++ b/sys/boot/arm64/efi/Makefile
@@ -17,13 +17,13 @@ SRCS+=	copy.c devicename.c exec.c bootinfo.c cache.c
 CFLAGS+=	-fno-builtin -mgeneral-regs-only
 CFLAGS+=	-I${.CURDIR}
 CFLAGS+=	-I${.CURDIR}/../../efi/include
-CFLAGS+=	-I${.CURDIR}/../../efi/include/arm64
+CFLAGS+=	-I${.CURDIR}/../../efi/include/aarch64
 
 .if ${MK_FORTH} != "no"
 BOOT_FORTH=	yes
 CFLAGS+=	-DBOOT_FORTH
 CFLAGS+=	-I${.CURDIR}/../../ficl
-CFLAGS+=	-I${.CURDIR}/../../ficl/arm64
+CFLAGS+=	-I${.CURDIR}/../../ficl/aarch64
 LIBFICL=	${.OBJDIR}/../../ficl/libficl.a
 .endif
 .if ${MK_FDT} != "no"
@@ -42,7 +42,7 @@ CFLAGS+=	-I${.CURDIR}/../../common
 FILES=	loader.efi
 FILESMODE_loader.efi=	${BINMODE}
 
-LDSCRIPT=	${.CURDIR}/ldscript.arm64
+LDSCRIPT=	${.CURDIR}/ldscript.aarch64
 LDFLAGS=	-Wl,-T${LDSCRIPT} -Wl,-Bsymbolic -shared
 
 ${PROG}:	${LDSCRIPT}
diff --git a/sys/boot/arm64/efi/ldscript.arm64 b/sys/boot/arm64/efi/ldscript.aarch64
similarity index 100%
rename from sys/boot/arm64/efi/ldscript.arm64
rename to sys/boot/arm64/efi/ldscript.aarch64
diff --git a/sys/boot/common/Makefile.inc b/sys/boot/common/Makefile.inc
index a565a26..fd89934 100644
--- a/sys/boot/common/Makefile.inc
+++ b/sys/boot/common/Makefile.inc
@@ -9,10 +9,10 @@ SRCS+=	load_elf32.c load_elf32_obj.c reloc_elf32.c
 SRCS+=	load_elf64.c load_elf64_obj.c reloc_elf64.c
 .elif ${MACHINE} == "pc98"
 SRCS+=	load_elf32.c load_elf32_obj.c reloc_elf32.c
-.elif ${MACHINE_CPUARCH} == "arm"
-SRCS+=	load_elf32.c reloc_elf32.c
-.elif ${MACHINE_CPUARCH} == "arm64" 
+.elif ${MACHINE_CPUARCH} == "aarch64" 
 SRCS+=	load_elf64.c reloc_elf64.c
+.elif ${MACHINE_CPUARCH} == "arm"
+SRCS+=	load_elf32.c reloc_elf32.
 .elif ${MACHINE_CPUARCH} == "powerpc"
 SRCS+=	load_elf32.c reloc_elf32.c
 SRCS+=	load_elf64.c reloc_elf64.c
diff --git a/sys/boot/efi/fdt/Makefile b/sys/boot/efi/fdt/Makefile
index 05fbee870..06853c9 100644
--- a/sys/boot/efi/fdt/Makefile
+++ b/sys/boot/efi/fdt/Makefile
@@ -10,7 +10,7 @@ INTERNALLIB=
 SRCS=		efi_fdt.c
 
 CFLAGS+=	-ffreestanding -msoft-float
-.if ${MACHINE_CPUARCH} == "arm64"
+.if ${MACHINE_CPUARCH} == "aarch64"
 CFLAGS+=	-mgeneral-regs-only
 .endif
 
diff --git a/sys/boot/efi/include/arm64/efibind.h b/sys/boot/efi/include/aarch64/efibind.h
similarity index 100%
rename from sys/boot/efi/include/arm64/efibind.h
rename to sys/boot/efi/include/aarch64/efibind.h
diff --git a/sys/boot/efi/libefi/Makefile b/sys/boot/efi/libefi/Makefile
index 0c929d0..623c9d1 100644
--- a/sys/boot/efi/libefi/Makefile
+++ b/sys/boot/efi/libefi/Makefile
@@ -11,7 +11,7 @@ SRCS+= nullconsole.c comconsole.c
 .if ${MACHINE_ARCH} == "amd64"
 CFLAGS+= -fPIC -mno-red-zone
 .endif
-.if ${MACHINE_CPUARCH} == "arm64"
+.if ${MACHINE_CPUARCH} == "aarch64"
 CFLAGS+=	-mgeneral-regs-only
 .endif
 CFLAGS+= -I${.CURDIR}/../include
diff --git a/sys/boot/fdt/Makefile b/sys/boot/fdt/Makefile
index 5b553b5..dd0037d 100644
--- a/sys/boot/fdt/Makefile
+++ b/sys/boot/fdt/Makefile
@@ -17,7 +17,7 @@ CFLAGS+=	-I${.CURDIR}/../../contrib/libfdt/ -I${.CURDIR}/../common/
 CFLAGS+=	-ffreestanding
 
 .if ${MACHINE_CPUARCH} == "powerpc" || ${MACHINE_CPUARCH} == "arm" || ${MACHINE_CPUARCH} == "mips" || \
-    ${MACHINE_CPUARCH} == "arm64"
+    ${MACHINE_CPUARCH} == "aarch64"
 CFLAGS+=	-msoft-float
 .endif
 
diff --git a/sys/boot/ficl/Makefile b/sys/boot/ficl/Makefile
index b2f3b53..009a735 100644
--- a/sys/boot/ficl/Makefile
+++ b/sys/boot/ficl/Makefile
@@ -27,7 +27,7 @@ CFLAGS+=	-mno-red-zone
 .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"
 CFLAGS+=	-mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3 -msoft-float
 .endif
-.if ${MACHINE_CPUARCH} == "arm64"
+.if ${MACHINE_CPUARCH} == "aarch64"
 CFLAGS+=	-mgeneral-regs-only
 .endif
 .if ${MACHINE_CPUARCH} == "powerpc" || ${MACHINE_CPUARCH} == "arm" || ${MACHINE_CPUARCH} == "mips"
diff --git a/sys/boot/ficl/arm64/sysdep.c b/sys/boot/ficl/aarch64/sysdep.c
similarity index 100%
rename from sys/boot/ficl/arm64/sysdep.c
rename to sys/boot/ficl/aarch64/sysdep.c
diff --git a/sys/boot/ficl/arm64/sysdep.h b/sys/boot/ficl/aarch64/sysdep.h
similarity index 100%
rename from sys/boot/ficl/arm64/sysdep.h
rename to sys/boot/ficl/aarch64/sysdep.h
diff --git a/usr.bin/xlint/arch/arm64/targparam.h b/usr.bin/xlint/arch/aarch64/targparam.h
similarity index 100%
rename from usr.bin/xlint/arch/arm64/targparam.h
rename to usr.bin/xlint/arch/aarch64/targparam.h