diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index 316270849abe..254fa755b2c9 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -38,6 +38,8 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20180211: remove usb.conf
+OLD_FILES+=etc/devd/usb.conf
 # 20180208: remove c_rehash(1)
 OLD_FILES+=usr/share/openssl/man/man1/c_rehash.1.gz
 # 20180206: remove gdbtui
diff --git a/UPDATING b/UPDATING
index 29e941e9601c..4e4da15417ba 100644
--- a/UPDATING
+++ b/UPDATING
@@ -51,6 +51,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12.x IS SLOW:
 
 ****************************** SPECIAL WARNING: ******************************
 
+20180211:
+	devmatch functionality has been turned on in devd. It will automatically
+	load drivers for unattached devices. This may cause unexpected drivers to
+	be loaded. Please report any problems to current@ and imp@freebsd.org.
+
 20180114:
 	Clang, llvm, lld, lldb, compiler-rt and libc++ have been upgraded to
 	6.0.0.  Please see the 20141231 entry below for information about
diff --git a/etc/devd/Makefile b/etc/devd/Makefile
index 8d4f0c1d4cf6..758ee82d438f 100644
--- a/etc/devd/Makefile
+++ b/etc/devd/Makefile
@@ -12,7 +12,7 @@ FILES+=	apple.conf
 .if ${MK_ACPI} != "no"
 FILES+=	asus.conf
 .endif
-FILES+=devmatch.conf
+FILES+=	devmatch.conf
 .if ${MK_HYPERV} != "no"
 FILES+=	hyperv.conf
 .endif