22 files changed, 89 insertions, 6 deletions
diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha
index dc3997b62c2..2957c033776 100644
--- a/distrib/sets/lists/base/md.alpha
+++ b/distrib/sets/lists/base/md.alpha
@@ -735,6 +735,10 @@
 ./usr/libdata/perl5/site_perl/alpha-openbsd/ddb/db_watch.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/des.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev
+./usr/libdata/perl5/site_perl/alpha-openbsd/dev/acpi
+./usr/libdata/perl5/site_perl/alpha-openbsd/dev/acpi/acpireg.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/dev/acpi/acpivar.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/dev/acpi/hpetreg.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/ata
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/ata/atareg.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/ata/atavar.ph
diff --git a/distrib/sets/lists/base/md.amd64 b/distrib/sets/lists/base/md.amd64
index 634189bbfb0..96de8c9a2f9 100644
--- a/distrib/sets/lists/base/md.amd64
+++ b/distrib/sets/lists/base/md.amd64
@@ -748,6 +748,10 @@
 ./usr/libdata/perl5/site_perl/amd64-openbsd/ddb/db_watch.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/des.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev
+./usr/libdata/perl5/site_perl/amd64-openbsd/dev/acpi
+./usr/libdata/perl5/site_perl/amd64-openbsd/dev/acpi/acpireg.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/dev/acpi/acpivar.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/dev/acpi/hpetreg.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/ata
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/ata/atareg.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/ata/atavar.ph
@@ -2243,6 +2247,8 @@
 ./usr/mdec/installboot
 ./usr/mdec/mbr
 ./usr/mdec/pxeboot
+./usr/sbin/acpid
+./usr/sbin/acpidump
 ./usr/sbin/hotplugd
 ./usr/sbin/wsconscfg
 ./usr/sbin/wsfontload
diff --git a/distrib/sets/lists/base/md.cats b/distrib/sets/lists/base/md.cats
index b977e9710aa..2f2d4ef4f56 100644
--- a/distrib/sets/lists/base/md.cats
+++ b/distrib/sets/lists/base/md.cats
@@ -781,6 +781,10 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/ddb/db_watch.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/des.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev
+./usr/libdata/perl5/site_perl/arm-openbsd/dev/acpi
+./usr/libdata/perl5/site_perl/arm-openbsd/dev/acpi/acpireg.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/dev/acpi/acpivar.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/dev/acpi/hpetreg.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/ata
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/ata/atareg.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/ata/atavar.ph
diff --git a/distrib/sets/lists/base/md.hp300 b/distrib/sets/lists/base/md.hp300
index e92211db192..08cdeaeabf9 100644
--- a/distrib/sets/lists/base/md.hp300
+++ b/distrib/sets/lists/base/md.hp300
@@ -642,6 +642,10 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/ddb/db_watch.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/des.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/acpi
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/acpi/acpireg.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/acpi/acpivar.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/acpi/hpetreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ata
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ata/atareg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ata/atavar.ph
diff --git a/distrib/sets/lists/base/md.hppa b/distrib/sets/lists/base/md.hppa
index cc763990cd0..cc57cac6a8d 100644
--- a/distrib/sets/lists/base/md.hppa
+++ b/distrib/sets/lists/base/md.hppa
@@ -679,6 +679,10 @@
 ./usr/libdata/perl5/site_perl/hppa-openbsd/ddb/db_watch.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/des.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev
+./usr/libdata/perl5/site_perl/hppa-openbsd/dev/acpi
+./usr/libdata/perl5/site_perl/hppa-openbsd/dev/acpi/acpireg.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/dev/acpi/acpivar.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/dev/acpi/hpetreg.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/ata
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/ata/atareg.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/ata/atavar.ph
diff --git a/distrib/sets/lists/base/md.hppa64 b/distrib/sets/lists/base/md.hppa64
index 4bd5526b45d..c4fa5fdf97d 100644
--- a/distrib/sets/lists/base/md.hppa64
+++ b/distrib/sets/lists/base/md.hppa64
@@ -679,6 +679,10 @@
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/ddb/db_watch.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/des.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev
+./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/acpi
+./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/acpi/acpireg.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/acpi/acpivar.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/acpi/hpetreg.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/ata
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/ata/atareg.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/ata/atavar.ph
diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386
index d27f5c151e6..8946211a521 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -688,6 +688,10 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/ddb/db_watch.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/des.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev
+./usr/libdata/perl5/site_perl/i386-openbsd/dev/acpi
+./usr/libdata/perl5/site_perl/i386-openbsd/dev/acpi/acpireg.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/dev/acpi/acpivar.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/dev/acpi/hpetreg.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/ata
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/ata/atareg.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/ata/atavar.ph
@@ -2258,6 +2262,8 @@
 ./usr/mdec/installboot
 ./usr/mdec/mbr
 ./usr/mdec/pxeboot
+./usr/sbin/acpid
+./usr/sbin/acpidump
 ./usr/sbin/apm
 ./usr/sbin/apmd
 ./usr/sbin/bad144
diff --git a/distrib/sets/lists/base/md.luna88k b/distrib/sets/lists/base/md.luna88k
index 27d812872e3..d76fef77938 100644
--- a/distrib/sets/lists/base/md.luna88k
+++ b/distrib/sets/lists/base/md.luna88k
@@ -575,6 +575,10 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/ddb/db_watch.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/des.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/acpi
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/acpi/acpireg.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/acpi/acpivar.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/acpi/hpetreg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ata
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ata/atareg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ata/atavar.ph
diff --git a/distrib/sets/lists/base/md.mac68k b/distrib/sets/lists/base/md.mac68k
index 0ebb68d19c0..31fcb963456 100644
--- a/distrib/sets/lists/base/md.mac68k
+++ b/distrib/sets/lists/base/md.mac68k
@@ -641,6 +641,10 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/ddb/db_watch.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/des.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/acpi
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/acpi/acpireg.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/acpi/acpivar.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/acpi/hpetreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ata
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ata/atareg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ata/atavar.ph
diff --git a/distrib/sets/lists/base/md.macppc b/distrib/sets/lists/base/md.macppc
index 9811aefff51..ef0308dfc06 100644
--- a/distrib/sets/lists/base/md.macppc
+++ b/distrib/sets/lists/base/md.macppc
@@ -685,6 +685,10 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/ddb/db_watch.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/des.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/acpi
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/acpi/acpireg.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/acpi/acpivar.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/acpi/hpetreg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ata
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ata/atareg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ata/atavar.ph
diff --git a/distrib/sets/lists/base/md.mvme68k b/distrib/sets/lists/base/md.mvme68k
index 5e476afc270..4cb7101dee7 100644
--- a/distrib/sets/lists/base/md.mvme68k
+++ b/distrib/sets/lists/base/md.mvme68k
@@ -640,6 +640,10 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/ddb/db_watch.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/des.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/acpi
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/acpi/acpireg.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/acpi/acpivar.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/acpi/hpetreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ata
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ata/atareg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ata/atavar.ph
diff --git a/distrib/sets/lists/base/md.mvme88k b/distrib/sets/lists/base/md.mvme88k
index 8ed9cf7b2d6..26599574013 100644
--- a/distrib/sets/lists/base/md.mvme88k
+++ b/distrib/sets/lists/base/md.mvme88k
@@ -574,6 +574,10 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/ddb/db_watch.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/des.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/acpi
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/acpi/acpireg.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/acpi/acpivar.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/acpi/hpetreg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ata
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ata/atareg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ata/atavar.ph
diff --git a/distrib/sets/lists/base/md.mvmeppc b/distrib/sets/lists/base/md.mvmeppc
index 8338487b37b..5540c268940 100644
--- a/distrib/sets/lists/base/md.mvmeppc
+++ b/distrib/sets/lists/base/md.mvmeppc
@@ -676,6 +676,10 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/ddb/db_watch.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/des.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/acpi
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/acpi/acpireg.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/acpi/acpivar.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/acpi/hpetreg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ata
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ata/atareg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ata/atavar.ph
diff --git a/distrib/sets/lists/base/md.sgi b/distrib/sets/lists/base/md.sgi
index 12bc8169f69..e4f734577c5 100644
--- a/distrib/sets/lists/base/md.sgi
+++ b/distrib/sets/lists/base/md.sgi
@@ -683,6 +683,10 @@
 ./usr/libdata/perl5/site_perl/mips64-openbsd/ddb/db_watch.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/des.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev
+./usr/libdata/perl5/site_perl/mips64-openbsd/dev/acpi
+./usr/libdata/perl5/site_perl/mips64-openbsd/dev/acpi/acpireg.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/dev/acpi/acpivar.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/dev/acpi/hpetreg.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/ata
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/ata/atareg.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/ata/atavar.ph
diff --git a/distrib/sets/lists/base/md.sparc b/distrib/sets/lists/base/md.sparc
index 9711e8be6fe..dcc7979ec70 100644
--- a/distrib/sets/lists/base/md.sparc
+++ b/distrib/sets/lists/base/md.sparc
@@ -141,6 +141,10 @@
 ./usr/libdata/perl5/site_perl/sparc-openbsd/ddb/db_watch.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/des.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev
+./usr/libdata/perl5/site_perl/sparc-openbsd/dev/acpi
+./usr/libdata/perl5/site_perl/sparc-openbsd/dev/acpi/acpireg.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/dev/acpi/acpivar.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/dev/acpi/hpetreg.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/ata
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/ata/atareg.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/ata/atavar.ph
diff --git a/distrib/sets/lists/base/md.sparc64 b/distrib/sets/lists/base/md.sparc64
index 3f8e6924b26..78407084349 100644
--- a/distrib/sets/lists/base/md.sparc64
+++ b/distrib/sets/lists/base/md.sparc64
@@ -168,6 +168,10 @@
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/ddb/db_watch.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/des.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev
+./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/acpi
+./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/acpi/acpireg.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/acpi/acpivar.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/acpi/hpetreg.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/ata
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/ata/atareg.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/ata/atavar.ph
diff --git a/distrib/sets/lists/base/md.vax b/distrib/sets/lists/base/md.vax
index 7ce0174f7aa..6b9327900bd 100644
--- a/distrib/sets/lists/base/md.vax
+++ b/distrib/sets/lists/base/md.vax
@@ -79,6 +79,10 @@
 ./usr/libdata/perl5/site_perl/vax-openbsd/ddb/db_watch.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/des.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev
+./usr/libdata/perl5/site_perl/vax-openbsd/dev/acpi
+./usr/libdata/perl5/site_perl/vax-openbsd/dev/acpi/acpireg.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/dev/acpi/acpivar.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/dev/acpi/hpetreg.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/ata
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/ata/atareg.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/ata/atavar.ph
diff --git a/distrib/sets/lists/base/md.zaurus b/distrib/sets/lists/base/md.zaurus
index 8b7a646d8b3..9d70baa239a 100644
--- a/distrib/sets/lists/base/md.zaurus
+++ b/distrib/sets/lists/base/md.zaurus
@@ -722,6 +722,10 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/ddb/db_watch.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/des.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev
+./usr/libdata/perl5/site_perl/arm-openbsd/dev/acpi
+./usr/libdata/perl5/site_perl/arm-openbsd/dev/acpi/acpireg.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/dev/acpi/acpivar.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/dev/acpi/hpetreg.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/ata
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/ata/atareg.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/ata/atavar.ph
diff --git a/distrib/sets/lists/base/mi b/distrib/sets/lists/base/mi
index a02c7c53fda..38d64dde3f9 100644
--- a/distrib/sets/lists/base/mi
+++ b/distrib/sets/lists/base/mi
@@ -1879,6 +1879,7 @@
 ./usr/sbin/rtsold
 ./usr/sbin/rwhod
 ./usr/sbin/sa
+./usr/sbin/sasyncd
 ./usr/sbin/sendmail
 ./usr/sbin/sensorsd
 ./usr/sbin/sesd
@@ -4394,4 +4395,3 @@
 ./var/yp/Makefile.yp
 ./var/yp/Makefile.yp.dist
 ./var/yp/README
-./usr/sbin/sasyncd
diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index 3d0cc7223c4..b834e596a04 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -99,6 +99,10 @@
 ./usr/include/ddb/db_watch.h
 ./usr/include/des.h
 ./usr/include/dev
+./usr/include/dev/acpi
+./usr/include/dev/acpi/acpireg.h
+./usr/include/dev/acpi/acpivar.h
+./usr/include/dev/acpi/hpetreg.h
 ./usr/include/dev/ata
 ./usr/include/dev/ata/atareg.h
 ./usr/include/dev/ata/atavar.h
@@ -314,6 +318,7 @@
 ./usr/include/dev/ic/rtl80x9reg.h
 ./usr/include/dev/ic/rtl80x9var.h
 ./usr/include/dev/ic/rtl81x9reg.h
+./usr/include/dev/ic/rtl8225reg.h
 ./usr/include/dev/ic/rtwreg.h
 ./usr/include/dev/ic/rtwvar.h
 ./usr/include/dev/ic/s3_617.h
@@ -5573,4 +5578,3 @@
 ./usr/share/misc/gprof.flat
 ./usr/share/misc/operator
 ./var/db/libc.tags
-./usr/include/dev/ic/rtl8225reg.h
diff --git a/distrib/sets/lists/etc/mi b/distrib/sets/lists/etc/mi
index ea25ef37682..50a7b083581 100644
--- a/distrib/sets/lists/etc/mi
+++ b/distrib/sets/lists/etc/mi
@@ -133,6 +133,7 @@
 ./root/.klogin
 ./root/.login
 ./root/.profile
+./usr/share/ipsec/isakmpd/VPN-default.conf
 ./var/crash/minfree
 ./var/cron/at.deny
 ./var/cron/cron.deny
@@ -746,4 +747,3 @@
 ./var/www/icons/world1.png
 ./var/www/icons/world2.gif
 ./var/www/icons/world2.png
-./usr/share/ipsec/isakmpd/VPN-default.conf
diff --git a/distrib/sets/lists/man/mi b/distrib/sets/lists/man/mi
index 5393a99d0b0..0a75b4c173d 100644
--- a/distrib/sets/lists/man/mi
+++ b/distrib/sets/lists/man/mi
@@ -263,6 +263,7 @@
 ./usr/share/man/cat1/gzcat.0
 ./usr/share/man/cat1/gzexe.0
 ./usr/share/man/cat1/gzip.0
+./usr/share/man/cat1/gzsig.0
 ./usr/share/man/cat1/h2ph.0
 ./usr/share/man/cat1/h2xs.0
 ./usr/share/man/cat1/head.0
@@ -1831,6 +1832,7 @@
 ./usr/share/man/cat5/rndc.conf.0
 ./usr/share/man/cat5/rpc.0
 ./usr/share/man/cat5/rtadvd.conf.0
+./usr/share/man/cat5/sasyncd.conf.0
 ./usr/share/man/cat5/securenet.0
 ./usr/share/man/cat5/sensorsd.conf.0
 ./usr/share/man/cat5/services.0
@@ -1900,6 +1902,7 @@
 ./usr/share/man/cat8/UKC.0
 ./usr/share/man/cat8/ac.0
 ./usr/share/man/cat8/accton.0
+./usr/share/man/cat8/acpidump.0
 ./usr/share/man/cat8/activadm.0
 ./usr/share/man/cat8/activinit.0
 ./usr/share/man/cat8/afsd.0
@@ -1918,6 +1921,7 @@
 ./usr/share/man/cat8/amd.0
 ./usr/share/man/cat8/amd64
 ./usr/share/man/cat8/amd64/MAKEDEV.0
+./usr/share/man/cat8/amd64/acpid.0
 ./usr/share/man/cat8/amd64/biosboot.0
 ./usr/share/man/cat8/amd64/boot.0
 ./usr/share/man/cat8/amd64/boot.conf.0
@@ -2045,6 +2049,7 @@
 ./usr/share/man/cat8/httpd.0
 ./usr/share/man/cat8/i386
 ./usr/share/man/cat8/i386/MAKEDEV.0
+./usr/share/man/cat8/i386/acpid.0
 ./usr/share/man/cat8/i386/apm.0
 ./usr/share/man/cat8/i386/apmd.0
 ./usr/share/man/cat8/i386/bad144.0
@@ -2256,6 +2261,7 @@
 ./usr/share/man/cat8/rwalld.0
 ./usr/share/man/cat8/rwhod.0
 ./usr/share/man/cat8/sa.0
+./usr/share/man/cat8/sasyncd.0
 ./usr/share/man/cat8/savecore.0
 ./usr/share/man/cat8/scan_ffs.0
 ./usr/share/man/cat8/scsi.0
@@ -2604,6 +2610,3 @@
 ./usr/share/texinfo
 ./usr/share/texinfo/texinfo.dtd
 ./usr/share/texinfo/texinfo.xsl
-./usr/share/man/cat1/gzsig.0
-./usr/share/man/cat5/sasyncd.conf.0
-./usr/share/man/cat8/sasyncd.0