diff --git a/etc/Makefile b/etc/Makefile
index fb60669fbd4..738b389e2e6 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -13,7 +13,6 @@ SUBDIR+=sendmail
 .endif
 
 BIN1=	crontab \
-	devd.conf \
 	devfs.conf \
 	dhclient.conf \
 	disktab \
@@ -152,7 +151,6 @@ distribution:
 	${_+_}cd ${.CURDIR}/bluetooth; ${MAKE} install
 .endif
 	${_+_}cd ${.CURDIR}/defaults; ${MAKE} install
-	${_+_}cd ${.CURDIR}/devd; ${MAKE} install
 	${_+_}cd ${.CURDIR}/gss; ${MAKE} install
 	${_+_}cd ${.CURDIR}/mtree; ${MAKE} install
 	${_+_}cd ${SRCTOP}/share/termcap; ${MAKE} etc-termcap
diff --git a/etc/devd/Makefile b/etc/devd/Makefile
deleted file mode 100644
index 9a73cfa03ab..00000000000
--- a/etc/devd/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# $FreeBSD$
-
-.include <src.opts.mk>
-
-FILEGROUPS=	FILES
-
-FILES+=	devmatch.conf
-
-.if ${MACHINE} == "powerpc"
-FILES+=	apple.conf
-.endif
-
-.if ${MACHINE} == "amd64" || ${MACHINE} == "i386"
-.if ${MK_ACPI} != "no"
-FILES+=	asus.conf
-.endif
-.if ${MK_HYPERV} != "no"
-FILES+=	hyperv.conf
-.endif
-.endif
-
-.if ${MK_USB} != "no"
-FILES+=	uath.conf ulpt.conf
-.endif
-
-.if ${MK_ZFS} != "no"
-FILES+=	zfs.conf
-.endif
-
-NO_OBJ=
-FILESDIR=	/etc/devd
-FILESMODE=	644
-
-.include <bsd.prog.mk>
diff --git a/sbin/devd/Makefile b/sbin/devd/Makefile
index 85d0d591c6d..0d6c54f24f2 100644
--- a/sbin/devd/Makefile
+++ b/sbin/devd/Makefile
@@ -4,6 +4,30 @@
 
 WARNS?= 3
 PACKAGE=runtime
+CONFGROUPS=	CONFS DEVD
+CONFS=	devd.conf
+DEVD=	devmatch.conf
+DEVDDIR=	/etc/devd
+.if ${MK_ACPI} != "no"
+DEVD+=	asus.conf
+.endif
+
+.if ${MK_HYPERV} != "no"
+DEVD+=	hyperv.conf
+.endif
+
+.if ${MK_USB} != "no"
+DEVD+=	uath.conf ulpt.conf
+.endif
+
+.if ${MACHINE_ARCH} == "powerpc"
+DEVD+=	apple.conf
+.endif
+
+.if ${MK_ZFS} != "no"
+DEVD+=	zfs.conf
+.endif
+
 PROG_CXX=devd
 SRCS=	devd.cc token.l parse.y y.tab.h
 MAN=	devd.8 devd.conf.5
diff --git a/etc/devd/apple.conf b/sbin/devd/apple.conf
similarity index 100%
rename from etc/devd/apple.conf
rename to sbin/devd/apple.conf
diff --git a/etc/devd/asus.conf b/sbin/devd/asus.conf
similarity index 100%
rename from etc/devd/asus.conf
rename to sbin/devd/asus.conf
diff --git a/etc/devd.conf b/sbin/devd/devd.conf
similarity index 100%
rename from etc/devd.conf
rename to sbin/devd/devd.conf
diff --git a/etc/devd/devmatch.conf b/sbin/devd/devmatch.conf
similarity index 100%
rename from etc/devd/devmatch.conf
rename to sbin/devd/devmatch.conf
diff --git a/etc/devd/hyperv.conf b/sbin/devd/hyperv.conf
similarity index 100%
rename from etc/devd/hyperv.conf
rename to sbin/devd/hyperv.conf
diff --git a/etc/devd/uath.conf b/sbin/devd/uath.conf
similarity index 100%
rename from etc/devd/uath.conf
rename to sbin/devd/uath.conf
diff --git a/etc/devd/ulpt.conf b/sbin/devd/ulpt.conf
similarity index 100%
rename from etc/devd/ulpt.conf
rename to sbin/devd/ulpt.conf
diff --git a/etc/devd/zfs.conf b/sbin/devd/zfs.conf
similarity index 100%
rename from etc/devd/zfs.conf
rename to sbin/devd/zfs.conf