Index: ObsoleteFiles.inc
===================================================================
--- ObsoleteFiles.inc
+++ ObsoleteFiles.inc
@@ -38,9 +38,6 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
-# 20180721: Purge some old forgotten apmd files
-OLD_FILES+=etc/apmd.conf
-OLD_FILES+=etc/rc.d/apmd
 # 20180721: move of libmlx5.so.1 and libibverbs.so.1
 OLD_LIBS+=usr/lib/libmlx5.so.1
 OLD_LIBS+=usr/lib/libibverbs.so.1
Index: etc/Makefile
===================================================================
--- etc/Makefile
+++ etc/Makefile
@@ -76,6 +76,12 @@
 BIN1+= amd.map
 .endif
 
+.if ${MACHINE} == "i386"
+.if ${MK_APM} != "no"
+BIN1+= apmd.conf
+.endif
+.endif
+
 .if ${MK_AUTOFS} != "no"
 BIN1+=	auto_master
 .endif
Index: etc/rc.d/Makefile
===================================================================
--- etc/rc.d/Makefile
+++ etc/rc.d/Makefile
@@ -157,6 +157,9 @@
 .if ${MK_APM} != "no"
 FILESGROUPS+=	APM
 APM+=		apm
+.if ${MACHINE} == "i386"
+APM+=		apmd
+.endif
 APMPACKAGE=	apm
 .endif