17 files changed, 65 insertions, 48 deletions
diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha
index 01205e29512..6aaaedd9d7c 100644
--- a/distrib/sets/lists/base/md.alpha
+++ b/distrib/sets/lists/base/md.alpha
@@ -734,6 +734,7 @@
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/cardbus/cardbusvar.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/cardbus/cardslotvar.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/cardbus/rbus.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/dev/cardbus/usb_cardbus.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/ccdvar.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/clock_subr.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/cons.ph
@@ -1025,6 +1026,7 @@
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/mii/amphyreg.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/mii/bmtphyreg.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/mii/brgphyreg.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/dev/mii/ciphyreg.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/mii/eephyreg.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/mii/icsphyreg.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/mii/inphyreg.ph
@@ -1117,6 +1119,8 @@
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/if_tlreg.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/if_txpreg.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/if_txvar.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/if_vgereg.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/if_vgevar.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/if_vrreg.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/if_wbreg.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/isesreg.ph
@@ -2216,6 +2220,3 @@
 ./usr/share/misc/pcvtfonts/vt220l.810
 ./usr/share/misc/pcvtfonts/vt220l.814
 ./usr/share/misc/pcvtfonts/vt220l.816
-./usr/libdata/perl5/site_perl/alpha-openbsd/dev/mii/ciphyreg.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/if_vgereg.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/if_vgevar.ph
diff --git a/distrib/sets/lists/base/md.amd64 b/distrib/sets/lists/base/md.amd64
index 93ed3fe2967..76b5f14791f 100644
--- a/distrib/sets/lists/base/md.amd64
+++ b/distrib/sets/lists/base/md.amd64
@@ -747,6 +747,7 @@
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/cardbus/cardbusvar.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/cardbus/cardslotvar.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/cardbus/rbus.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/dev/cardbus/usb_cardbus.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/ccdvar.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/clock_subr.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/cons.ph
@@ -1038,6 +1039,7 @@
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/mii/amphyreg.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/mii/bmtphyreg.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/mii/brgphyreg.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/dev/mii/ciphyreg.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/mii/eephyreg.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/mii/icsphyreg.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/mii/inphyreg.ph
@@ -1130,6 +1132,8 @@
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/pci/if_tlreg.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/pci/if_txpreg.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/pci/if_txvar.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/dev/pci/if_vgereg.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/dev/pci/if_vgevar.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/pci/if_vrreg.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/pci/if_wbreg.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/pci/isesreg.ph
@@ -2247,6 +2251,3 @@
 ./usr/share/misc/pcvtfonts/vt220l.810
 ./usr/share/misc/pcvtfonts/vt220l.814
 ./usr/share/misc/pcvtfonts/vt220l.816
-./usr/libdata/perl5/site_perl/amd64-openbsd/dev/mii/ciphyreg.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/dev/pci/if_vgereg.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/dev/pci/if_vgevar.ph
diff --git a/distrib/sets/lists/base/md.cats b/distrib/sets/lists/base/md.cats
index ab128a50bd6..520e9e54968 100644
--- a/distrib/sets/lists/base/md.cats
+++ b/distrib/sets/lists/base/md.cats
@@ -779,6 +779,7 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/cardbus/cardbusvar.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/cardbus/cardslotvar.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/cardbus/rbus.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/dev/cardbus/usb_cardbus.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/ccdvar.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/clock_subr.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/cons.ph
@@ -1070,6 +1071,7 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/mii/amphyreg.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/mii/bmtphyreg.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/mii/brgphyreg.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/dev/mii/ciphyreg.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/mii/eephyreg.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/mii/icsphyreg.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/mii/inphyreg.ph
@@ -1162,6 +1164,8 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/if_tlreg.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/if_txpreg.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/if_txvar.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/if_vgereg.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/if_vgevar.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/if_vrreg.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/if_wbreg.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/isesreg.ph
@@ -2270,6 +2274,3 @@
 ./usr/share/misc/pcvtfonts/vt220l.810
 ./usr/share/misc/pcvtfonts/vt220l.814
 ./usr/share/misc/pcvtfonts/vt220l.816
-./usr/libdata/perl5/site_perl/arm-openbsd/dev/mii/ciphyreg.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/if_vgereg.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/if_vgevar.ph
diff --git a/distrib/sets/lists/base/md.hp300 b/distrib/sets/lists/base/md.hp300
index 540704526a4..fabe9edcfa6 100644
--- a/distrib/sets/lists/base/md.hp300
+++ b/distrib/sets/lists/base/md.hp300
@@ -655,6 +655,7 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/cardbus/cardbusvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/cardbus/cardslotvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/cardbus/rbus.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/cardbus/usb_cardbus.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ccdvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/clock_subr.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/cons.ph
@@ -946,6 +947,7 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/mii/amphyreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/mii/bmtphyreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/mii/brgphyreg.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/mii/ciphyreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/mii/eephyreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/mii/icsphyreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/mii/inphyreg.ph
@@ -1038,6 +1040,8 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_tlreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_txpreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_txvar.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_vgereg.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_vgevar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_vrreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_wbreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/isesreg.ph
@@ -2194,6 +2198,3 @@
 ./usr/mdec/uboot.lif
 ./usr/sbin/grfinfo
 ./usr/sbin/hilinfo
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/mii/ciphyreg.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_vgereg.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_vgevar.ph
diff --git a/distrib/sets/lists/base/md.hppa b/distrib/sets/lists/base/md.hppa
index fc3f60d2670..3ae86106f2e 100644
--- a/distrib/sets/lists/base/md.hppa
+++ b/distrib/sets/lists/base/md.hppa
@@ -678,6 +678,7 @@
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/cardbus/cardbusvar.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/cardbus/cardslotvar.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/cardbus/rbus.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/dev/cardbus/usb_cardbus.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/ccdvar.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/clock_subr.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/cons.ph
@@ -969,6 +970,7 @@
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/mii/amphyreg.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/mii/bmtphyreg.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/mii/brgphyreg.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/dev/mii/ciphyreg.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/mii/eephyreg.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/mii/icsphyreg.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/mii/inphyreg.ph
@@ -1061,6 +1063,8 @@
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/pci/if_tlreg.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/pci/if_txpreg.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/pci/if_txvar.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/dev/pci/if_vgereg.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/dev/pci/if_vgevar.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/pci/if_vrreg.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/pci/if_wbreg.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/pci/isesreg.ph
@@ -2203,6 +2207,3 @@
 ./usr/mdec/xxboot
 ./usr/sbin/wsconscfg
 ./usr/sbin/wsfontload
-./usr/libdata/perl5/site_perl/hppa-openbsd/dev/mii/ciphyreg.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/dev/pci/if_vgereg.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/dev/pci/if_vgevar.ph
diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386
index 654b3b99941..1376a5f29c6 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -685,6 +685,7 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/cardbus/cardbusvar.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/cardbus/cardslotvar.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/cardbus/rbus.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/dev/cardbus/usb_cardbus.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/ccdvar.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/clock_subr.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/cons.ph
@@ -976,6 +977,7 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/mii/amphyreg.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/mii/bmtphyreg.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/mii/brgphyreg.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/dev/mii/ciphyreg.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/mii/eephyreg.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/mii/icsphyreg.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/mii/inphyreg.ph
@@ -1068,6 +1070,8 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/if_tlreg.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/if_txpreg.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/if_txvar.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/if_vgereg.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/if_vgevar.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/if_vrreg.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/if_wbreg.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/isesreg.ph
@@ -2248,6 +2252,3 @@
 ./usr/share/misc/pcvtfonts/vt220l.810
 ./usr/share/misc/pcvtfonts/vt220l.814
 ./usr/share/misc/pcvtfonts/vt220l.816
-./usr/libdata/perl5/site_perl/i386-openbsd/dev/mii/ciphyreg.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/if_vgereg.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/if_vgevar.ph
diff --git a/distrib/sets/lists/base/md.luna88k b/distrib/sets/lists/base/md.luna88k
index 0fa38484300..1d8c9ed9550 100644
--- a/distrib/sets/lists/base/md.luna88k
+++ b/distrib/sets/lists/base/md.luna88k
@@ -589,6 +589,7 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/cardbus/cardbusvar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/cardbus/cardslotvar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/cardbus/rbus.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/cardbus/usb_cardbus.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ccdvar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/clock_subr.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/cons.ph
@@ -880,6 +881,7 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/mii/amphyreg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/mii/bmtphyreg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/mii/brgphyreg.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/mii/ciphyreg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/mii/eephyreg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/mii/icsphyreg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/mii/inphyreg.ph
@@ -972,6 +974,8 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/if_tlreg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/if_txpreg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/if_txvar.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/if_vgereg.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/if_vgevar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/if_vrreg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/if_wbreg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/isesreg.ph
@@ -2124,6 +2128,3 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/zlib.ph
 ./usr/local/libdata/perl5/site_perl/m88k-openbsd
 ./usr/sbin/wsconscfg
-./usr/libdata/perl5/site_perl/m88k-openbsd/dev/mii/ciphyreg.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/if_vgereg.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/if_vgevar.ph
diff --git a/distrib/sets/lists/base/md.mac68k b/distrib/sets/lists/base/md.mac68k
index c9eaa498f76..be18b0c3836 100644
--- a/distrib/sets/lists/base/md.mac68k
+++ b/distrib/sets/lists/base/md.mac68k
@@ -656,6 +656,7 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/cardbus/cardbusvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/cardbus/cardslotvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/cardbus/rbus.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/cardbus/usb_cardbus.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ccdvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/clock_subr.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/cons.ph
@@ -947,6 +948,7 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/mii/amphyreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/mii/bmtphyreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/mii/brgphyreg.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/mii/ciphyreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/mii/eephyreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/mii/icsphyreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/mii/inphyreg.ph
@@ -1039,6 +1041,8 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_tlreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_txpreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_txvar.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_vgereg.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_vgevar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_vrreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_wbreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/isesreg.ph
@@ -2190,6 +2194,3 @@
 ./usr/libexec/ld.so
 ./usr/libexec/sudo_noexec.so
 ./usr/local/libdata/perl5/site_perl/m68k-openbsd
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/mii/ciphyreg.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_vgereg.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_vgevar.ph
diff --git a/distrib/sets/lists/base/md.macppc b/distrib/sets/lists/base/md.macppc
index 9132a12ed89..cec826aaac1 100644
--- a/distrib/sets/lists/base/md.macppc
+++ b/distrib/sets/lists/base/md.macppc
@@ -684,6 +684,7 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/cardbus/cardbusvar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/cardbus/cardslotvar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/cardbus/rbus.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/cardbus/usb_cardbus.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ccdvar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/clock_subr.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/cons.ph
@@ -975,6 +976,7 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/mii/amphyreg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/mii/bmtphyreg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/mii/brgphyreg.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/mii/ciphyreg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/mii/eephyreg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/mii/icsphyreg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/mii/inphyreg.ph
@@ -1067,6 +1069,8 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/if_tlreg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/if_txpreg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/if_txvar.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/if_vgereg.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/if_vgevar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/if_vrreg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/if_wbreg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/isesreg.ph
@@ -2253,6 +2257,3 @@
 ./usr/sbin/hotplugd
 ./usr/sbin/wsconscfg
 ./usr/sbin/zzz
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/mii/ciphyreg.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/if_vgereg.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/if_vgevar.ph
diff --git a/distrib/sets/lists/base/md.mvme68k b/distrib/sets/lists/base/md.mvme68k
index 4c70f2d3142..f729715fd8e 100644
--- a/distrib/sets/lists/base/md.mvme68k
+++ b/distrib/sets/lists/base/md.mvme68k
@@ -655,6 +655,7 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/cardbus/cardbusvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/cardbus/cardslotvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/cardbus/rbus.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/cardbus/usb_cardbus.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ccdvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/clock_subr.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/cons.ph
@@ -946,6 +947,7 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/mii/amphyreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/mii/bmtphyreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/mii/brgphyreg.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/mii/ciphyreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/mii/eephyreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/mii/icsphyreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/mii/inphyreg.ph
@@ -1038,6 +1040,8 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_tlreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_txpreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_txvar.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_vgereg.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_vgevar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_vrreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_wbreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/isesreg.ph
@@ -2193,6 +2197,3 @@
 ./usr/mdec/rboot
 ./usr/mdec/sboot
 ./usr/mdec/stboot
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/mii/ciphyreg.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_vgereg.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_vgevar.ph
diff --git a/distrib/sets/lists/base/md.mvme88k b/distrib/sets/lists/base/md.mvme88k
index e9e4a63ac69..17a08b21f4f 100644
--- a/distrib/sets/lists/base/md.mvme88k
+++ b/distrib/sets/lists/base/md.mvme88k
@@ -588,6 +588,7 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/cardbus/cardbusvar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/cardbus/cardslotvar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/cardbus/rbus.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/cardbus/usb_cardbus.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ccdvar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/clock_subr.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/cons.ph
@@ -879,6 +880,7 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/mii/amphyreg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/mii/bmtphyreg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/mii/brgphyreg.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/mii/ciphyreg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/mii/eephyreg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/mii/icsphyreg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/mii/inphyreg.ph
@@ -971,6 +973,8 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/if_tlreg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/if_txpreg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/if_txvar.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/if_vgereg.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/if_vgevar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/if_vrreg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/if_wbreg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/isesreg.ph
@@ -2139,6 +2143,3 @@
 ./usr/mdec/netboot
 ./usr/mdec/stboot
 ./usr/mdec/tftpboot
-./usr/libdata/perl5/site_perl/m88k-openbsd/dev/mii/ciphyreg.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/if_vgereg.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/if_vgevar.ph
diff --git a/distrib/sets/lists/base/md.mvmeppc b/distrib/sets/lists/base/md.mvmeppc
index 69a82385689..5d7d9130b0e 100644
--- a/distrib/sets/lists/base/md.mvmeppc
+++ b/distrib/sets/lists/base/md.mvmeppc
@@ -675,6 +675,7 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/cardbus/cardbusvar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/cardbus/cardslotvar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/cardbus/rbus.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/cardbus/usb_cardbus.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ccdvar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/clock_subr.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/cons.ph
@@ -966,6 +967,7 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/mii/amphyreg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/mii/bmtphyreg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/mii/brgphyreg.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/mii/ciphyreg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/mii/eephyreg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/mii/icsphyreg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/mii/inphyreg.ph
@@ -1057,6 +1059,8 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/if_tlreg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/if_txpreg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/if_txvar.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/if_vgereg.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/if_vgevar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/if_vrreg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/if_wbreg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/isesreg.ph
@@ -2174,6 +2178,3 @@
 ./usr/mdec/installboot
 ./usr/mdec/mbr
 ./usr/sbin/wsconscfg
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/mii/ciphyreg.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/if_vgereg.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/if_vgevar.ph
diff --git a/distrib/sets/lists/base/md.sgi b/distrib/sets/lists/base/md.sgi
index 8987ecf7bd7..3a4fcebbca6 100644
--- a/distrib/sets/lists/base/md.sgi
+++ b/distrib/sets/lists/base/md.sgi
@@ -679,6 +679,7 @@
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/cardbus/cardbusvar.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/cardbus/cardslotvar.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/cardbus/rbus.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/dev/cardbus/usb_cardbus.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/ccdvar.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/clock_subr.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/cons.ph
@@ -970,6 +971,7 @@
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/mii/amphyreg.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/mii/bmtphyreg.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/mii/brgphyreg.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/dev/mii/ciphyreg.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/mii/eephyreg.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/mii/icsphyreg.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/mii/inphyreg.ph
@@ -1062,6 +1064,8 @@
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/if_tlreg.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/if_txpreg.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/if_txvar.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/if_vgereg.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/if_vgevar.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/if_vrreg.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/if_wbreg.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/isesreg.ph
@@ -2237,6 +2241,3 @@
 ./usr/mdec/boot
 ./usr/mdec/sgivol
 ./usr/sbin/wsconscfg
-./usr/libdata/perl5/site_perl/mips64-openbsd/dev/mii/ciphyreg.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/if_vgereg.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/if_vgevar.ph
diff --git a/distrib/sets/lists/base/md.sparc b/distrib/sets/lists/base/md.sparc
index f11b9d1878e..3756bd8dac8 100644
--- a/distrib/sets/lists/base/md.sparc
+++ b/distrib/sets/lists/base/md.sparc
@@ -156,6 +156,7 @@
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/cardbus/cardbusvar.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/cardbus/cardslotvar.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/cardbus/rbus.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/dev/cardbus/usb_cardbus.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/ccdvar.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/clock_subr.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/cons.ph
@@ -447,6 +448,7 @@
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/mii/amphyreg.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/mii/bmtphyreg.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/mii/brgphyreg.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/dev/mii/ciphyreg.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/mii/eephyreg.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/mii/icsphyreg.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/mii/inphyreg.ph
@@ -539,6 +541,8 @@
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/if_tlreg.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/if_txpreg.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/if_txvar.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/if_vgereg.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/if_vgevar.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/if_vrreg.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/if_wbreg.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/isesreg.ph
@@ -2176,6 +2180,3 @@
 ./usr/sbin/eeprom
 ./usr/sbin/fdformat
 ./usr/sbin/wsconscfg
-./usr/libdata/perl5/site_perl/sparc-openbsd/dev/mii/ciphyreg.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/if_vgereg.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/if_vgevar.ph
diff --git a/distrib/sets/lists/base/md.sparc64 b/distrib/sets/lists/base/md.sparc64
index fa42ae9045b..b3c93b2ab58 100644
--- a/distrib/sets/lists/base/md.sparc64
+++ b/distrib/sets/lists/base/md.sparc64
@@ -167,6 +167,7 @@
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/cardbus/cardbusvar.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/cardbus/cardslotvar.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/cardbus/rbus.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/cardbus/usb_cardbus.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/ccdvar.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/clock_subr.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/cons.ph
@@ -458,6 +459,7 @@
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/mii/amphyreg.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/mii/bmtphyreg.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/mii/brgphyreg.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/mii/ciphyreg.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/mii/eephyreg.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/mii/icsphyreg.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/mii/inphyreg.ph
@@ -550,6 +552,8 @@
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/pci/if_tlreg.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/pci/if_txpreg.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/pci/if_txvar.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/pci/if_vgereg.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/pci/if_vgevar.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/pci/if_vrreg.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/pci/if_wbreg.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/pci/isesreg.ph
@@ -2204,6 +2208,3 @@
 ./usr/sbin/eeprom
 ./usr/sbin/hotplugd
 ./usr/sbin/wsconscfg
-./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/mii/ciphyreg.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/pci/if_vgereg.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/pci/if_vgevar.ph
diff --git a/distrib/sets/lists/base/md.vax b/distrib/sets/lists/base/md.vax
index 103e5bfa213..a3ed6355794 100644
--- a/distrib/sets/lists/base/md.vax
+++ b/distrib/sets/lists/base/md.vax
@@ -93,6 +93,7 @@
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/cardbus/cardbusvar.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/cardbus/cardslotvar.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/cardbus/rbus.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/dev/cardbus/usb_cardbus.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/ccdvar.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/clock_subr.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/cons.ph
@@ -384,6 +385,7 @@
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/mii/amphyreg.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/mii/bmtphyreg.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/mii/brgphyreg.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/dev/mii/ciphyreg.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/mii/eephyreg.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/mii/icsphyreg.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/mii/inphyreg.ph
@@ -476,6 +478,8 @@
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/if_tlreg.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/if_txpreg.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/if_txvar.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/if_vgereg.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/if_vgevar.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/if_vrreg.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/if_wbreg.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/isesreg.ph
@@ -2099,6 +2103,3 @@
 ./usr/mdec/raboot
 ./usr/mdec/sdboot
 ./usr/mdec/xxboot
-./usr/libdata/perl5/site_perl/vax-openbsd/dev/mii/ciphyreg.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/if_vgereg.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/if_vgevar.ph
diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index 2b70f52323e..356486afa6f 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -112,6 +112,7 @@
 ./usr/include/dev/cardbus/cardbusvar.h
 ./usr/include/dev/cardbus/cardslotvar.h
 ./usr/include/dev/cardbus/rbus.h
+./usr/include/dev/cardbus/usb_cardbus.h
 ./usr/include/dev/ccdvar.h
 ./usr/include/dev/clock_subr.h
 ./usr/include/dev/cons.h