diff --git a/etc/Makefile b/etc/Makefile
index 8f4eca19e6a1..26259c096990 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -27,10 +27,6 @@ BIN1=	\
 
 # NB: keep these sorted by MK_* knobs
 
-.if ${MK_AMD} != "no"
-BIN1+= amd.map
-.endif
-
 .if ${MK_LOCATE} != "no"
 BIN1+=	${SRCTOP}/usr.bin/locate/locate/locate.rc
 .endif
diff --git a/usr.sbin/amd/amd/Makefile b/usr.sbin/amd/amd/Makefile
index c1d5f4a295ff..9e95e6f72a0b 100644
--- a/usr.sbin/amd/amd/Makefile
+++ b/usr.sbin/amd/amd/Makefile
@@ -10,6 +10,7 @@
 
 .PATH:	${SRCTOP}/contrib/amd/amd
 
+CONFS=	amd.map
 PROG=	amd
 MAN=	amd.8
 SRCS=	am_ops.c amd.c amfs_auto.c amfs_direct.c amfs_error.c amfs_generic.c
diff --git a/etc/amd.map b/usr.sbin/amd/amd/amd.map
similarity index 100%
rename from etc/amd.map
rename to usr.sbin/amd/amd/amd.map