diff --git a/libexec/rc/rc.d/Makefile b/libexec/rc/rc.d/Makefile
index f25338c6876..3eed19987f8 100644
--- a/libexec/rc/rc.d/Makefile
+++ b/libexec/rc/rc.d/Makefile
@@ -92,11 +92,11 @@ CONFGROUPS.${MK_ACPI}+=		ACPI
 ACPIPACKAGE=			acpi
 ACPI=		power_profile
 
+.if ${MACHINE} == "i386"
 CONFGROUPS.${MK_APM}+=		APM
 APMPACKAGE=			apm
-APM=		apm
-.if ${MACHINE} == "i386"
-APM+=		apmd
+APM=		apm \
+		apmd
 .endif
 
 CONFGROUPS.${MK_AUDIT}+=	AUDIT
diff --git a/packages/Makefile.arm b/packages/Makefile.arm
index db36ead2382..e7e37f03a7b 100644
--- a/packages/Makefile.arm
+++ b/packages/Makefile.arm
@@ -15,4 +15,3 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 SUBDIR.${MK_ACPI}+=	acpi
-SUBDIR.${MK_APM}+=	apm
diff --git a/packages/Makefile.arm64 b/packages/Makefile.arm64
index 4bfca51bd03..2df3c30b354 100644
--- a/packages/Makefile.arm64
+++ b/packages/Makefile.arm64
@@ -15,6 +15,5 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 SUBDIR.${MK_ACPI}+=	acpi
-SUBDIR.${MK_APM}+=	apm
 SUBDIR.${MK_BHYVE}+=	bhyve
 SUBDIR.${MK_BHYVE}+=	libvmmapi
diff --git a/packages/Makefile.i386 b/packages/Makefile.i386
new file mode 100644
index 00000000000..db36ead2382
--- /dev/null
+++ b/packages/Makefile.i386
@@ -0,0 +1,18 @@
+# SPDX-License-Identifier: ISC
+#
+# Copyright (c) 2026 Lexi Winter <ivy@FreeBSD.org>
+#
+# Permission to use, copy, modify, and distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+SUBDIR.${MK_ACPI}+=	acpi
+SUBDIR.${MK_APM}+=	apm
diff --git a/packages/Makefile.powerpc b/packages/Makefile.powerpc
index db36ead2382..e7e37f03a7b 100644
--- a/packages/Makefile.powerpc
+++ b/packages/Makefile.powerpc
@@ -15,4 +15,3 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 SUBDIR.${MK_ACPI}+=	acpi
-SUBDIR.${MK_APM}+=	apm
diff --git a/packages/Makefile.riscv64 b/packages/Makefile.riscv64
index 4bfca51bd03..2df3c30b354 100644
--- a/packages/Makefile.riscv64
+++ b/packages/Makefile.riscv64
@@ -15,6 +15,5 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 SUBDIR.${MK_ACPI}+=	acpi
-SUBDIR.${MK_APM}+=	apm
 SUBDIR.${MK_BHYVE}+=	bhyve
 SUBDIR.${MK_BHYVE}+=	libvmmapi
diff --git a/packages/apm/Makefile b/packages/apm/Makefile
index ddf8d1ed12a..b2488d13bb0 100644
--- a/packages/apm/Makefile
+++ b/packages/apm/Makefile
@@ -1,11 +1,5 @@
 WORLDPACKAGE=	apm
 
-# On non-amd64 platforms, this package only contain an rc script.
-# (This should be fixed.)
-.if ${MACHINE_CPUARCH} != "amd64"
-SUBPACKAGES=
-.endif
-
 # APM isn't applicable to jails.
 PKG_SETS=	optional
 
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index 6b28b2ae40d..5c1b47d97a8 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -61,6 +61,9 @@ OLD_FILES+=etc/rc.d/apmd
 OLD_FILES+=etc/apmd.conf
 OLD_FILES+=usr/sbin/apm
 OLD_FILES+=usr/share/examples/etc/apmd.conf
+.elif ${TARGET_ARCH} != "i386"
+OLD_FILES+=etc/rc.d/apm
+OLD_FILES+=etc/rc.d/apmd
 .endif
 
 .if ${MK_AT} == no