diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64
index f421304b1903..4bb454fd4e2a 100644
--- a/sys/conf/files.arm64
+++ b/sys/conf/files.arm64
@@ -361,6 +361,10 @@ dev/iicbus/twsi/a10_twsi.c	optional	twsi fdt
 dev/iicbus/twsi/twsi.c		optional	twsi fdt
 dev/iommu/busdma_iommu.c	optional	iommu
 dev/iommu/iommu_gas.c		optional	iommu
+dev/ipmi/ipmi.c			optional	ipmi
+dev/ipmi/ipmi_acpi.c		optional	ipmi acpi
+dev/ipmi/ipmi_kcs.c		optional	ipmi
+dev/ipmi/ipmi_smic.c		optional	ipmi
 dev/mbox/mbox_if.m		optional	soc_brcm_bcm2837
 dev/mmc/host/dwmmc.c		optional	dwmmc fdt
 dev/mmc/host/dwmmc_altera.c	optional	dwmmc dwmmc_altera fdt
diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index 2a294aa68462..49b9960596e9 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -505,6 +505,7 @@ _ibcore=	ibcore
 _ipoib=		ipoib
 _iser=		iser
 .endif
+_ipmi=		ipmi
 _mlx4=		mlx4
 _mlx5=		mlx5
 .if (${MK_INET_SUPPORT} != "no" && ${MK_INET6_SUPPORT} != "no") || \
@@ -682,7 +683,6 @@ _ichwd=		ichwd
 _ida=		ida
 _iir=		iir
 _intelspi=	intelspi
-_ipmi=		ipmi
 _ips=		ips
 _isci=		isci
 _ipw=		ipw
diff --git a/sys/modules/ipmi/Makefile b/sys/modules/ipmi/Makefile
index 4539dfda3b28..733ac6f30222 100644
--- a/sys/modules/ipmi/Makefile
+++ b/sys/modules/ipmi/Makefile
@@ -7,11 +7,19 @@
 KMOD=	ipmi
 SRCS=	ipmi.c
 SRCS+=	bus_if.h device_if.h
-.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"
-SRCS+=	ipmi_kcs.c ipmi_smic.c ipmi_smbios.c ipmi_ssif.c
-SRCS+=	ipmi_acpi.c ipmi_isa.c ipmi_pci.c ipmi_smbus.c
+
+.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" || \
+    ${MACHINE_CPUARCH} == "aarch64"
+SRCS+=	ipmi_kcs.c ipmi_smic.c
+SRCS+=	ipmi_acpi.c
 SRCS+=	opt_acpi.h
-SRCS+=	acpi_if.h isa_if.h pci_if.h smbus_if.h
+SRCS+=	acpi_if.h
+.endif
+
+.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"
+SRCS+=	ipmi_smbios.c ipmi_ssif.c
+SRCS+=	ipmi_isa.c ipmi_pci.c ipmi_smbus.c
+SRCS+=	isa_if.h pci_if.h smbus_if.h
 
 SUBDIR+= ipmi_linux