diff --git a/etc/devd.conf b/etc/devd.conf
index 8c918ad41822..24bd32367591 100644
--- a/etc/devd.conf
+++ b/etc/devd.conf
@@ -19,12 +19,13 @@ options {
 	# Setup some shorthand for regex that we use later in the file.
 	set ethernet-nic-regex
 		"(an|ar|ath|aue|awi|axe|bfe|bge|cm|cnw|cs|cue|dc|de|ed|el|em|\
-		ep|ex|fe|fxp|gem|hme|ie|kue|lge|lnc|my|nge|pcn|ray|re|rl|\
-		rue|sf|sis|sk|sn|snc|ste|ti|tl|tx|txp|vge|vr|vx|wb|wi|xe|\
-		xl)[0-9]+";
+		ep|ex|fe|fxp|gem|hme|ie|kue|lge|lnc|my|nge|pcn|ray|re|rl|rue|\
+		sf|sis|sk|sn|snc|ste|ti|tl|tx|txp|udav|vge|vr|vx|wb|wi|xe|xl)\
+		[0-9]+";
 	set scsi-controller-regex
-		"(adv|advw|aic|aha|ahb|ahc|ahd|bt|ct|iir|isp|mly|mpt|ncv|nsp|\
-		stg|sym|wds)[0-9]+";
+		"(aac|adv|adw|aha|ahb|ahc|ahd|aic|amd|amr|asr|bt|ciss|ct|dpt|\
+		ida|iir|ips|isp|mlx|mly|mpt|ncr|ncv|nsp|stg|sym|trm|wds)\
+		[0-9]+";
 };
 
 # Note that the attach/detach with the highest value wins, so that one can