22 files changed, 34 insertions, 22 deletions
diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha
index dc2b587f5b3..06b23d620c6 100644
--- a/distrib/sets/lists/base/md.alpha
+++ b/distrib/sets/lists/base/md.alpha
@@ -34,6 +34,7 @@
 ./etc/firmware/ral-rt2860
 ./etc/firmware/rum-license
 ./etc/firmware/rum-rt2573
+./etc/firmware/run-rt2870
 ./etc/firmware/tht
 ./etc/firmware/tht-license
 ./etc/firmware/tusb3410
@@ -1812,6 +1813,7 @@
 ./usr/libdata/perl5/site_perl/alpha-openbsd/net/route.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/net/slcompress.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/net/slip.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/net/trunklacp.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/net/zlib.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/net80211
 ./usr/libdata/perl5/site_perl/alpha-openbsd/net80211/ieee80211.ph
@@ -2362,4 +2364,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/net/trunklacp.ph
diff --git a/distrib/sets/lists/base/md.amd64 b/distrib/sets/lists/base/md.amd64
index 4f49afa8b73..da1a31ce7ee 100644
--- a/distrib/sets/lists/base/md.amd64
+++ b/distrib/sets/lists/base/md.amd64
@@ -36,6 +36,7 @@
 ./etc/firmware/ral-rt2860
 ./etc/firmware/rum-license
 ./etc/firmware/rum-rt2573
+./etc/firmware/run-rt2870
 ./etc/firmware/tht
 ./etc/firmware/tht-license
 ./etc/firmware/tusb3410
@@ -1837,6 +1838,7 @@
 ./usr/libdata/perl5/site_perl/amd64-openbsd/net/route.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/net/slcompress.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/net/slip.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/net/trunklacp.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/net/zlib.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/net80211
 ./usr/libdata/perl5/site_perl/amd64-openbsd/net80211/ieee80211.ph
@@ -2397,4 +2399,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/net/trunklacp.ph
diff --git a/distrib/sets/lists/base/md.armish b/distrib/sets/lists/base/md.armish
index a2602968c5c..35e48c73a33 100644
--- a/distrib/sets/lists/base/md.armish
+++ b/distrib/sets/lists/base/md.armish
@@ -22,6 +22,7 @@
 ./etc/firmware/ral-rt2860
 ./etc/firmware/rum-license
 ./etc/firmware/rum-rt2573
+./etc/firmware/run-rt2870
 ./etc/firmware/tusb3410
 ./etc/firmware/tusb3410-license
 ./etc/firmware/zd1211
@@ -1835,6 +1836,7 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/net/route.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/net/slcompress.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/net/slip.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/net/trunklacp.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/net/zlib.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/net80211
 ./usr/libdata/perl5/site_perl/arm-openbsd/net80211/ieee80211.ph
@@ -2356,4 +2358,3 @@
 ./usr/mdec/boot
 ./usr/sbin/hotplugd
 ./usr/sbin/pcidump
-./usr/libdata/perl5/site_perl/arm-openbsd/net/trunklacp.ph
diff --git a/distrib/sets/lists/base/md.aviion b/distrib/sets/lists/base/md.aviion
index 8d560a21fe7..1456b6f924e 100644
--- a/distrib/sets/lists/base/md.aviion
+++ b/distrib/sets/lists/base/md.aviion
@@ -1716,6 +1716,7 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/net/route.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/net/slcompress.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/net/slip.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/net/trunklacp.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/net/zlib.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/net80211
 ./usr/libdata/perl5/site_perl/m88k-openbsd/net80211/ieee80211.ph
@@ -2233,4 +2234,3 @@
 ./usr/local/libdata/perl5/site_perl/m88k-openbsd
 ./usr/mdec/a2coff
 ./usr/mdec/netboot
-./usr/libdata/perl5/site_perl/m88k-openbsd/net/trunklacp.ph
diff --git a/distrib/sets/lists/base/md.hp300 b/distrib/sets/lists/base/md.hp300
index d9b5ad015b1..11550ac5ea8 100644
--- a/distrib/sets/lists/base/md.hp300
+++ b/distrib/sets/lists/base/md.hp300
@@ -1770,6 +1770,7 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/net/route.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/net/slcompress.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/net/slip.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/net/trunklacp.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/net/zlib.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/net80211
 ./usr/libdata/perl5/site_perl/m68k-openbsd/net80211/ieee80211.ph
@@ -2299,4 +2300,3 @@
 ./usr/mdec/sdboot
 ./usr/mdec/uboot.lif
 ./usr/sbin/wsconscfg
-./usr/libdata/perl5/site_perl/m68k-openbsd/net/trunklacp.ph
diff --git a/distrib/sets/lists/base/md.hppa b/distrib/sets/lists/base/md.hppa
index d16be8ed492..4244f8e3b1c 100644
--- a/distrib/sets/lists/base/md.hppa
+++ b/distrib/sets/lists/base/md.hppa
@@ -34,6 +34,7 @@
 ./etc/firmware/ral-rt2860
 ./etc/firmware/rum-license
 ./etc/firmware/rum-rt2573
+./etc/firmware/run-rt2870
 ./etc/firmware/symbol-eprim
 ./etc/firmware/symbol-esec
 ./etc/firmware/symbol-license
@@ -1812,6 +1813,7 @@
 ./usr/libdata/perl5/site_perl/hppa-openbsd/net/route.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/net/slcompress.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/net/slip.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/net/trunklacp.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/net/zlib.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/net80211
 ./usr/libdata/perl5/site_perl/hppa-openbsd/net80211/ieee80211.ph
@@ -2341,4 +2343,3 @@
 ./usr/sbin/pcidump
 ./usr/sbin/wsconscfg
 ./usr/sbin/wsfontload
-./usr/libdata/perl5/site_perl/hppa-openbsd/net/trunklacp.ph
diff --git a/distrib/sets/lists/base/md.hppa64 b/distrib/sets/lists/base/md.hppa64
index 5fc99b0cb54..6e934ed53e6 100644
--- a/distrib/sets/lists/base/md.hppa64
+++ b/distrib/sets/lists/base/md.hppa64
@@ -34,6 +34,7 @@
 ./etc/firmware/ral-rt2860
 ./etc/firmware/rum-license
 ./etc/firmware/rum-rt2573
+./etc/firmware/run-rt2870
 ./etc/firmware/symbol-eprim
 ./etc/firmware/symbol-esec
 ./etc/firmware/symbol-license
@@ -1811,6 +1812,7 @@
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/net/route.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/net/slcompress.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/net/slip.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/net/trunklacp.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/net/zlib.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/net80211
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/net80211/ieee80211.ph
@@ -2340,4 +2342,3 @@
 ./usr/sbin/pcidump
 ./usr/sbin/wsconscfg
 ./usr/sbin/wsfontload
-./usr/libdata/perl5/site_perl/hppa64-openbsd/net/trunklacp.ph
diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386
index d344ccfa96d..7fa3b95a6f1 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -38,6 +38,7 @@
 ./etc/firmware/ral-rt2860
 ./etc/firmware/rum-license
 ./etc/firmware/rum-rt2573
+./etc/firmware/run-rt2870
 ./etc/firmware/symbol-eprim
 ./etc/firmware/symbol-esec
 ./etc/firmware/symbol-license
@@ -1844,6 +1845,7 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/net/route.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/net/slcompress.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/net/slip.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/net/trunklacp.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/net/zlib.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/net80211
 ./usr/libdata/perl5/site_perl/i386-openbsd/net80211/ieee80211.ph
@@ -2405,4 +2407,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/net/trunklacp.ph
diff --git a/distrib/sets/lists/base/md.landisk b/distrib/sets/lists/base/md.landisk
index 6f5904a6b3b..101e761ac71 100644
--- a/distrib/sets/lists/base/md.landisk
+++ b/distrib/sets/lists/base/md.landisk
@@ -17,6 +17,7 @@
 ./etc/firmware/kue-license
 ./etc/firmware/rum-license
 ./etc/firmware/rum-rt2573
+./etc/firmware/run-rt2870
 ./etc/firmware/tusb3410
 ./etc/firmware/tusb3410-license
 ./etc/firmware/uyap
@@ -1772,6 +1773,7 @@
 ./usr/libdata/perl5/site_perl/sh-openbsd/net/route.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/net/slcompress.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/net/slip.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/net/trunklacp.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/net/zlib.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/net80211
 ./usr/libdata/perl5/site_perl/sh-openbsd/net80211/ieee80211.ph
@@ -2353,4 +2355,3 @@
 ./usr/mdec/xxboot
 ./usr/sbin/hotplugd
 ./usr/sbin/pcidump
-./usr/libdata/perl5/site_perl/sh-openbsd/net/trunklacp.ph
diff --git a/distrib/sets/lists/base/md.luna88k b/distrib/sets/lists/base/md.luna88k
index c0d1da49ebc..f0667492de4 100644
--- a/distrib/sets/lists/base/md.luna88k
+++ b/distrib/sets/lists/base/md.luna88k
@@ -1711,6 +1711,7 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/net/route.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/net/slcompress.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/net/slip.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/net/trunklacp.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/net/zlib.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/net80211
 ./usr/libdata/perl5/site_perl/m88k-openbsd/net80211/ieee80211.ph
@@ -2227,4 +2228,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/net/trunklacp.ph
diff --git a/distrib/sets/lists/base/md.mac68k b/distrib/sets/lists/base/md.mac68k
index c628e20d2b8..3d508277565 100644
--- a/distrib/sets/lists/base/md.mac68k
+++ b/distrib/sets/lists/base/md.mac68k
@@ -1774,6 +1774,7 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/net/route.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/net/slcompress.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/net/slip.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/net/trunklacp.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/net/zlib.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/net80211
 ./usr/libdata/perl5/site_perl/m68k-openbsd/net80211/ieee80211.ph
@@ -2292,4 +2293,3 @@
 ./usr/libexec/sudo_noexec.so
 ./usr/local/libdata/perl5/site_perl/m68k-openbsd
 ./usr/sbin/wsconscfg
-./usr/libdata/perl5/site_perl/m68k-openbsd/net/trunklacp.ph
diff --git a/distrib/sets/lists/base/md.macppc b/distrib/sets/lists/base/md.macppc
index 530b906d953..f52c8ebeb47 100644
--- a/distrib/sets/lists/base/md.macppc
+++ b/distrib/sets/lists/base/md.macppc
@@ -34,6 +34,7 @@
 ./etc/firmware/ral-rt2860
 ./etc/firmware/rum-license
 ./etc/firmware/rum-rt2573
+./etc/firmware/run-rt2870
 ./etc/firmware/symbol-eprim
 ./etc/firmware/symbol-esec
 ./etc/firmware/symbol-license
@@ -1817,6 +1818,7 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/net/route.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/net/slcompress.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/net/slip.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/net/trunklacp.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/net/zlib.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/net80211
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/net80211/ieee80211.ph
@@ -2388,4 +2390,3 @@
 ./usr/sbin/pcidump
 ./usr/sbin/wsconscfg
 ./usr/sbin/zzz
-./usr/libdata/perl5/site_perl/powerpc-openbsd/net/trunklacp.ph
diff --git a/distrib/sets/lists/base/md.mvme68k b/distrib/sets/lists/base/md.mvme68k
index 4bea6d49e31..49c8187db53 100644
--- a/distrib/sets/lists/base/md.mvme68k
+++ b/distrib/sets/lists/base/md.mvme68k
@@ -1770,6 +1770,7 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/net/route.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/net/slcompress.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/net/slip.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/net/trunklacp.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/net/zlib.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/net80211
 ./usr/libdata/perl5/site_perl/m68k-openbsd/net80211/ieee80211.ph
@@ -2295,4 +2296,3 @@
 ./usr/mdec/rboot
 ./usr/mdec/sboot
 ./usr/mdec/stboot
-./usr/libdata/perl5/site_perl/m68k-openbsd/net/trunklacp.ph
diff --git a/distrib/sets/lists/base/md.mvme88k b/distrib/sets/lists/base/md.mvme88k
index 16e28d29077..1b4a29c975f 100644
--- a/distrib/sets/lists/base/md.mvme88k
+++ b/distrib/sets/lists/base/md.mvme88k
@@ -1720,6 +1720,7 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/net/route.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/net/slcompress.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/net/slip.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/net/trunklacp.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/net/zlib.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/net80211
 ./usr/libdata/perl5/site_perl/m88k-openbsd/net80211/ieee80211.ph
@@ -2242,4 +2243,3 @@
 ./usr/mdec/netboot
 ./usr/mdec/stboot
 ./usr/mdec/tftpboot
-./usr/libdata/perl5/site_perl/m88k-openbsd/net/trunklacp.ph
diff --git a/distrib/sets/lists/base/md.mvmeppc b/distrib/sets/lists/base/md.mvmeppc
index 22a8ed8d4a4..0bab18682fb 100644
--- a/distrib/sets/lists/base/md.mvmeppc
+++ b/distrib/sets/lists/base/md.mvmeppc
@@ -1726,6 +1726,7 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/net/route.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/net/slcompress.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/net/slip.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/net/trunklacp.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/net/zlib.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/net80211
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/net80211/ieee80211.ph
@@ -2294,4 +2295,3 @@
 ./usr/mdec/installboot
 ./usr/mdec/mbr
 ./usr/sbin/wsconscfg
-./usr/libdata/perl5/site_perl/powerpc-openbsd/net/trunklacp.ph
diff --git a/distrib/sets/lists/base/md.sgi b/distrib/sets/lists/base/md.sgi
index f5d1b04a0e0..8461ab70e28 100644
--- a/distrib/sets/lists/base/md.sgi
+++ b/distrib/sets/lists/base/md.sgi
@@ -34,6 +34,7 @@
 ./etc/firmware/ral-rt2860
 ./etc/firmware/rum-license
 ./etc/firmware/rum-rt2573
+./etc/firmware/run-rt2870
 ./etc/firmware/symbol-eprim
 ./etc/firmware/symbol-esec
 ./etc/firmware/symbol-license
@@ -1804,6 +1805,7 @@
 ./usr/libdata/perl5/site_perl/mips64-openbsd/net/route.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/net/slcompress.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/net/slip.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/net/trunklacp.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/net/zlib.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/net80211
 ./usr/libdata/perl5/site_perl/mips64-openbsd/net80211/ieee80211.ph
@@ -2371,4 +2373,3 @@
 ./usr/mdec/sgivol
 ./usr/sbin/pcidump
 ./usr/sbin/wsconscfg
-./usr/libdata/perl5/site_perl/mips64-openbsd/net/trunklacp.ph
diff --git a/distrib/sets/lists/base/md.socppc b/distrib/sets/lists/base/md.socppc
index be4c9aaa928..4d3c6ce7660 100644
--- a/distrib/sets/lists/base/md.socppc
+++ b/distrib/sets/lists/base/md.socppc
@@ -34,6 +34,7 @@
 ./etc/firmware/ral-rt2860
 ./etc/firmware/rum-license
 ./etc/firmware/rum-rt2573
+./etc/firmware/run-rt2870
 ./etc/firmware/tht
 ./etc/firmware/tht-license
 ./etc/firmware/tusb3410
@@ -1757,6 +1758,7 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/net/route.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/net/slcompress.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/net/slip.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/net/trunklacp.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/net/zlib.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/net80211
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/net80211/ieee80211.ph
@@ -2366,4 +2368,3 @@
 ./usr/mdec/mkboot
 ./usr/sbin/hotplugd
 ./usr/sbin/pcidump
-./usr/libdata/perl5/site_perl/powerpc-openbsd/net/trunklacp.ph
diff --git a/distrib/sets/lists/base/md.sparc b/distrib/sets/lists/base/md.sparc
index c8a13f86716..2a32261f22c 100644
--- a/distrib/sets/lists/base/md.sparc
+++ b/distrib/sets/lists/base/md.sparc
@@ -1191,6 +1191,7 @@
 ./usr/libdata/perl5/site_perl/sparc-openbsd/net/route.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/net/slcompress.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/net/slip.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/net/trunklacp.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/net/zlib.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/net80211
 ./usr/libdata/perl5/site_perl/sparc-openbsd/net80211/ieee80211.ph
@@ -2282,4 +2283,3 @@
 ./usr/sbin/fdformat
 ./usr/sbin/wsconscfg
 ./usr/sbin/zzz
-./usr/libdata/perl5/site_perl/sparc-openbsd/net/trunklacp.ph
diff --git a/distrib/sets/lists/base/md.sparc64 b/distrib/sets/lists/base/md.sparc64
index 2756daee9b8..07d5e05a38a 100644
--- a/distrib/sets/lists/base/md.sparc64
+++ b/distrib/sets/lists/base/md.sparc64
@@ -34,6 +34,7 @@
 ./etc/firmware/ral-rt2860
 ./etc/firmware/rum-license
 ./etc/firmware/rum-rt2573
+./etc/firmware/run-rt2870
 ./etc/firmware/symbol-eprim
 ./etc/firmware/symbol-esec
 ./etc/firmware/symbol-license
@@ -1249,6 +1250,7 @@
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/net/route.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/net/slcompress.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/net/slip.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/net/trunklacp.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/net/zlib.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/net80211
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/net80211/ieee80211.ph
@@ -2341,4 +2343,3 @@
 ./usr/sbin/hotplugd
 ./usr/sbin/pcidump
 ./usr/sbin/wsconscfg
-./usr/libdata/perl5/site_perl/sparc64-openbsd/net/trunklacp.ph
diff --git a/distrib/sets/lists/base/md.vax b/distrib/sets/lists/base/md.vax
index 01b345397cc..5bb2dea7220 100644
--- a/distrib/sets/lists/base/md.vax
+++ b/distrib/sets/lists/base/md.vax
@@ -1125,6 +1125,7 @@
 ./usr/libdata/perl5/site_perl/vax-openbsd/net/route.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/net/slcompress.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/net/slip.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/net/trunklacp.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/net/zlib.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/net80211
 ./usr/libdata/perl5/site_perl/vax-openbsd/net80211/ieee80211.ph
@@ -2205,4 +2206,3 @@
 ./usr/mdec/sdboot
 ./usr/mdec/xxboot
 ./usr/sbin/wsconscfg
-./usr/libdata/perl5/site_perl/vax-openbsd/net/trunklacp.ph
diff --git a/distrib/sets/lists/base/md.zaurus b/distrib/sets/lists/base/md.zaurus
index c98069a2ec9..37da31b6d5d 100644
--- a/distrib/sets/lists/base/md.zaurus
+++ b/distrib/sets/lists/base/md.zaurus
@@ -17,6 +17,7 @@
 ./etc/firmware/kue-license
 ./etc/firmware/rum-license
 ./etc/firmware/rum-rt2573
+./etc/firmware/run-rt2870
 ./etc/firmware/symbol-eprim
 ./etc/firmware/symbol-esec
 ./etc/firmware/symbol-license
@@ -1791,6 +1792,7 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/net/route.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/net/slcompress.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/net/slip.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/net/trunklacp.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/net/zlib.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/net80211
 ./usr/libdata/perl5/site_perl/arm-openbsd/net80211/ieee80211.ph
@@ -2362,4 +2364,3 @@
 ./usr/sbin/wsfontload
 ./usr/sbin/ztsscale
 ./usr/sbin/zzz
-./usr/libdata/perl5/site_perl/arm-openbsd/net/trunklacp.ph
diff --git a/distrib/sets/lists/base/mi b/distrib/sets/lists/base/mi
index 4ee4977061e..a43fcddce15 100644
--- a/distrib/sets/lists/base/mi
+++ b/distrib/sets/lists/base/mi
@@ -1,4 +1,3 @@
-./usr/sbin/rpc.statd
 ./altroot
 ./bin
 ./bin/[
@@ -1904,6 +1903,7 @@
 ./usr/sbin/route6d
 ./usr/sbin/rpc.bootparamd
 ./usr/sbin/rpc.lockd
+./usr/sbin/rpc.statd
 ./usr/sbin/rpc.yppasswdd
 ./usr/sbin/rtadvd
 ./usr/sbin/rtsold