diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index 254fa755b2c9..bb7ed214581b 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -38,6 +38,8 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20180212: move devmatch
+OLD_FILES+=usr/sbin/devmatch
 # 20180211: remove usb.conf
 OLD_FILES+=etc/devd/usb.conf
 # 20180208: remove c_rehash(1)
diff --git a/sbin/Makefile b/sbin/Makefile
index ca9f42ec0d6b..800de288f749 100644
--- a/sbin/Makefile
+++ b/sbin/Makefile
@@ -12,6 +12,7 @@ SUBDIR=adjkerntz \
 	conscontrol \
 	ddb \
 	devfs \
+	devmatch \
 	dhclient \
 	dmesg \
 	dump \
diff --git a/usr.sbin/devmatch/Makefile b/sbin/devmatch/Makefile
similarity index 100%
rename from usr.sbin/devmatch/Makefile
rename to sbin/devmatch/Makefile
diff --git a/usr.sbin/devmatch/devmatch.8 b/sbin/devmatch/devmatch.8
similarity index 100%
rename from usr.sbin/devmatch/devmatch.8
rename to sbin/devmatch/devmatch.8
diff --git a/usr.sbin/devmatch/devmatch.c b/sbin/devmatch/devmatch.c
similarity index 100%
rename from usr.sbin/devmatch/devmatch.c
rename to sbin/devmatch/devmatch.c
diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile
index f6597850d69f..d1338324214b 100644
--- a/usr.sbin/Makefile
+++ b/usr.sbin/Makefile
@@ -21,7 +21,6 @@ SUBDIR=	adduser \
 	dconschat \
 	devctl \
 	devinfo \
-	devmatch \
 	diskinfo \
 	dumpcis \
 	etcupdate \