Index: etc/Makefile
===================================================================
--- etc/Makefile
+++ etc/Makefile
@@ -123,13 +123,6 @@
 .endif
 	cd ${.CURDIR}/..; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \
 		${FREEBSD} ${DESTDIR}/
-.if ${MK_BOOT} != "no"
-.if exists(${SRCTOP}/sys/${MACHINE}/conf/GENERIC.hints)
-	${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \
-	    ${SRCTOP}/sys/${MACHINE}/conf/GENERIC.hints \
-	    ${DESTDIR}/boot/device.hints
-.endif
-.endif
 
 MTREE_CMD?=	mtree
 
Index: stand/Makefile
===================================================================
--- stand/Makefile
+++ stand/Makefile
@@ -38,4 +38,9 @@
 .endif
 .endfor
 
+.if exists(${SRCTOP}/sys/${MACHINE}/conf/GENERIC.hints)
+FILES+=	${SRCTOP}/sys/${MACHINE}/conf/GENERIC.hints
+FILESNAME_${SRCTOP}/sys/${MACHINE}/conf/GENERIC.hints=  device.hints
+.endif
+
 .include <bsd.subdir.mk>