diff --git a/etc/Makefile b/etc/Makefile
index 755965fe220e..73757a6e6683 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -76,12 +76,6 @@ BSM_ETC_DIR=			${DESTDIR}/etc/security
 BIN1+= amd.map
 .endif
 
-.if ${MACHINE} == "i386"
-.if ${MK_APM} != "no"
-BIN1+= apmd.conf
-.endif
-.endif
-
 .if ${MK_AUTOFS} != "no"
 BIN1+=	auto_master
 .endif
diff --git a/usr.sbin/apmd/Makefile b/usr.sbin/apmd/Makefile
index 20a4e5620ee7..4afd417eeb0d 100644
--- a/usr.sbin/apmd/Makefile
+++ b/usr.sbin/apmd/Makefile
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
+CONFS=	apmd.conf
 PROG=	apmd
 MAN=	apmd.8
 MANSUBDIR= /i386
diff --git a/etc/apmd.conf b/usr.sbin/apmd/apmd.conf
similarity index 100%
rename from etc/apmd.conf
rename to usr.sbin/apmd/apmd.conf