sync

24 files changed, 92 insertions, 99 deletions

diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha
index 409a63ba2d8..a406e08b524 100644
--- a/distrib/sets/lists/base/md.alpha
+++ b/distrib/sets/lists/base/md.alpha
@@ -32,9 +32,8 @@
 ./usr/lib/gcc-lib/alpha-unknown-openbsd3.3/2.95.3/cpp0
 ./usr/lib/gcc-lib/alpha-unknown-openbsd3.3/2.95.3/include
 ./usr/lib/gcc-lib/alpha-unknown-openbsd3.3/2.95.3/specs
-./usr/lib/libasn1.so.3.1
+./usr/lib/libasn1.so.13.0
 ./usr/lib/libc.so.30.0
-./usr/lib/libcom_err.so.1.0
 ./usr/lib/libcrypto.so.10.0
 ./usr/lib/libcurses++.so.2.0
 ./usr/lib/libcurses.so.9.0
@@ -42,10 +41,10 @@
 ./usr/lib/libedit.so.1.0
 ./usr/lib/libform.so.2.0
 ./usr/lib/libg2c.so.7.0
-./usr/lib/libgssapi.so.2.0
+./usr/lib/libgssapi.so.2.1
 ./usr/lib/libiberty.so.5.0
-./usr/lib/libkafs.so.12.0
-./usr/lib/libkrb5.so.5.2
+./usr/lib/libkafs.so.13.0
+./usr/lib/libkrb5.so.13.0
 ./usr/lib/libkvm.so.7.0
 ./usr/lib/libm.so.1.0
 ./usr/lib/libmenu.so.2.0
@@ -1453,9 +1452,10 @@
 ./usr/libdata/perl5/site_perl/alpha-openbsd/isofs/cd9660/iso.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/isofs/cd9660/iso_rrip.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/kerberosV
-./usr/libdata/perl5/site_perl/alpha-openbsd/kerberosV/admin.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/kerberosV/asn1-common.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/kerberosV/asn1_err.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/kerberosV/com_err.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/kerberosV/com_right.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/kerberosV/der.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/kerberosV/gssapi.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/kerberosV/hdb-private.ph
@@ -1467,9 +1467,10 @@
 ./usr/libdata/perl5/site_perl/alpha-openbsd/kerberosV/k524_err.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/kerberosV/kadm5
 ./usr/libdata/perl5/site_perl/alpha-openbsd/kerberosV/kadm5/admin.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/kerberosV/kadm5/kadm5-private.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/kerberosV/kadm5/kadm5-protos.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/kerberosV/kadm5/kadm5_err.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/kerberosV/kadm5/private.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/kerberosV/kadm5_err.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/kerberosV/kafs.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/kerberosV/krb5-private.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/kerberosV/krb5-protos.ph
@@ -1477,7 +1478,6 @@
 ./usr/libdata/perl5/site_perl/alpha-openbsd/kerberosV/krb5.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/kerberosV/krb5_asn1.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/kerberosV/krb5_err.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/kerberosV/private.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/keynote.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/kvm.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/langinfo.ph
diff --git a/distrib/sets/lists/base/md.hp300 b/distrib/sets/lists/base/md.hp300
index 2b1c0cbeb36..6d198475c9e 100644
--- a/distrib/sets/lists/base/md.hp300
+++ b/distrib/sets/lists/base/md.hp300
@@ -26,9 +26,8 @@
 ./usr/lib/gcc-lib/m68k-unknown-openbsd3.3/2.95.3/cpp0
 ./usr/lib/gcc-lib/m68k-unknown-openbsd3.3/2.95.3/include
 ./usr/lib/gcc-lib/m68k-unknown-openbsd3.3/2.95.3/specs
-./usr/lib/libasn1.so.3.1
+./usr/lib/libasn1.so.13.0
 ./usr/lib/libc.so.30.0
-./usr/lib/libcom_err.so.1.0
 ./usr/lib/libcrypto.so.10.0
 ./usr/lib/libcurses++.so.2.0
 ./usr/lib/libcurses.so.9.0
@@ -36,10 +35,10 @@
 ./usr/lib/libedit.so.1.0
 ./usr/lib/libform.so.2.0
 ./usr/lib/libg2c.so.7.0
-./usr/lib/libgssapi.so.2.0
+./usr/lib/libgssapi.so.2.1
 ./usr/lib/libiberty.so.5.0
-./usr/lib/libkafs.so.12.0
-./usr/lib/libkrb5.so.5.2
+./usr/lib/libkafs.so.13.0
+./usr/lib/libkrb5.so.13.0
 ./usr/lib/libkvm.so.7.0
 ./usr/lib/libm.so.1.0
 ./usr/lib/libmenu.so.2.0
@@ -1426,9 +1425,10 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/isofs/cd9660/iso.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/isofs/cd9660/iso_rrip.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV
-./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/admin.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/asn1-common.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/asn1_err.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/com_err.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/com_right.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/der.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/gssapi.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/hdb-private.ph
@@ -1440,9 +1440,10 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/k524_err.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/kadm5
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/kadm5/admin.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/kadm5/kadm5-private.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/kadm5/kadm5-protos.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/kadm5/kadm5_err.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/kadm5/private.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/kadm5_err.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/kafs.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/krb5-private.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/krb5-protos.ph
@@ -1450,7 +1451,6 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/krb5.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/krb5_asn1.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/krb5_err.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/private.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/keynote.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kvm.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/langinfo.ph
diff --git a/distrib/sets/lists/base/md.hppa b/distrib/sets/lists/base/md.hppa
index 9bcfc764d27..4c451dfe85d 100644
--- a/distrib/sets/lists/base/md.hppa
+++ b/distrib/sets/lists/base/md.hppa
@@ -1373,9 +1373,10 @@
 ./usr/libdata/perl5/site_perl/hppa-openbsd/isofs/cd9660/iso.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/isofs/cd9660/iso_rrip.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/kerberosV
-./usr/libdata/perl5/site_perl/hppa-openbsd/kerberosV/admin.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/kerberosV/asn1-common.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/kerberosV/asn1_err.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/kerberosV/com_err.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/kerberosV/com_right.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/kerberosV/der.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/kerberosV/gssapi.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/kerberosV/hdb-private.ph
@@ -1387,9 +1388,10 @@
 ./usr/libdata/perl5/site_perl/hppa-openbsd/kerberosV/k524_err.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/kerberosV/kadm5
 ./usr/libdata/perl5/site_perl/hppa-openbsd/kerberosV/kadm5/admin.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/kerberosV/kadm5/kadm5-private.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/kerberosV/kadm5/kadm5-protos.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/kerberosV/kadm5/kadm5_err.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/kerberosV/kadm5/private.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/kerberosV/kadm5_err.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/kerberosV/kafs.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/kerberosV/krb5-private.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/kerberosV/krb5-protos.ph
@@ -1397,7 +1399,6 @@
 ./usr/libdata/perl5/site_perl/hppa-openbsd/kerberosV/krb5.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/kerberosV/krb5_asn1.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/kerberosV/krb5_err.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/kerberosV/private.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/keynote.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/kvm.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/langinfo.ph
diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386
index f51e89d6d01..d64eec475e6 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -34,9 +34,8 @@
 ./usr/lib/gcc-lib/i386-unknown-openbsd3.3/2.95.3/cpp0
 ./usr/lib/gcc-lib/i386-unknown-openbsd3.3/2.95.3/include
 ./usr/lib/gcc-lib/i386-unknown-openbsd3.3/2.95.3/specs
-./usr/lib/libasn1.so.3.1
+./usr/lib/libasn1.so.13.0
 ./usr/lib/libc.so.30.0
-./usr/lib/libcom_err.so.1.0
 ./usr/lib/libcrypto.so.10.0
 ./usr/lib/libcurses++.so.2.0
 ./usr/lib/libcurses.so.9.0
@@ -44,10 +43,10 @@
 ./usr/lib/libedit.so.1.0
 ./usr/lib/libform.so.2.0
 ./usr/lib/libg2c.so.7.0
-./usr/lib/libgssapi.so.2.0
+./usr/lib/libgssapi.so.2.1
 ./usr/lib/libiberty.so.5.0
-./usr/lib/libkafs.so.12.0
-./usr/lib/libkrb5.so.5.2
+./usr/lib/libkafs.so.13.0
+./usr/lib/libkrb5.so.13.0
 ./usr/lib/libkvm.so.7.0
 ./usr/lib/libm.so.1.0
 ./usr/lib/libmenu.so.2.0
@@ -1456,9 +1455,10 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/isofs/cd9660/iso.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/isofs/cd9660/iso_rrip.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/kerberosV
-./usr/libdata/perl5/site_perl/i386-openbsd/kerberosV/admin.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/kerberosV/asn1-common.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/kerberosV/asn1_err.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/kerberosV/com_err.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/kerberosV/com_right.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/kerberosV/der.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/kerberosV/gssapi.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/kerberosV/hdb-private.ph
@@ -1470,9 +1470,10 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/kerberosV/k524_err.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/kerberosV/kadm5
 ./usr/libdata/perl5/site_perl/i386-openbsd/kerberosV/kadm5/admin.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/kerberosV/kadm5/kadm5-private.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/kerberosV/kadm5/kadm5-protos.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/kerberosV/kadm5/kadm5_err.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/kerberosV/kadm5/private.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/kerberosV/kadm5_err.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/kerberosV/kafs.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/kerberosV/krb5-private.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/kerberosV/krb5-protos.ph
@@ -1480,7 +1481,6 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/kerberosV/krb5.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/kerberosV/krb5_asn1.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/kerberosV/krb5_err.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/kerberosV/private.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/keynote.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/kvm.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/langinfo.ph
diff --git a/distrib/sets/lists/base/md.mac68k b/distrib/sets/lists/base/md.mac68k
index 0090c61175b..ec2378889d0 100644
--- a/distrib/sets/lists/base/md.mac68k
+++ b/distrib/sets/lists/base/md.mac68k
@@ -27,9 +27,8 @@
 ./usr/lib/gcc-lib/m68k-unknown-openbsd3.3/2.95.3/cpp0
 ./usr/lib/gcc-lib/m68k-unknown-openbsd3.3/2.95.3/include
 ./usr/lib/gcc-lib/m68k-unknown-openbsd3.3/2.95.3/specs
-./usr/lib/libasn1.so.3.1
+./usr/lib/libasn1.so.13.0
 ./usr/lib/libc.so.30.0
-./usr/lib/libcom_err.so.1.0
 ./usr/lib/libcrypto.so.10.0
 ./usr/lib/libcurses++.so.2.0
 ./usr/lib/libcurses.so.9.0
@@ -37,10 +36,10 @@
 ./usr/lib/libedit.so.1.0
 ./usr/lib/libform.so.2.0
 ./usr/lib/libg2c.so.7.0
-./usr/lib/libgssapi.so.2.0
+./usr/lib/libgssapi.so.2.1
 ./usr/lib/libiberty.so.5.0
-./usr/lib/libkafs.so.12.0
-./usr/lib/libkrb5.so.5.2
+./usr/lib/libkafs.so.13.0
+./usr/lib/libkrb5.so.13.0
 ./usr/lib/libkvm.so.7.0
 ./usr/lib/libm.so.1.0
 ./usr/lib/libmenu.so.2.0
@@ -1390,9 +1389,10 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/isofs/cd9660/iso.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/isofs/cd9660/iso_rrip.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV
-./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/admin.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/asn1-common.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/asn1_err.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/com_err.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/com_right.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/der.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/gssapi.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/hdb-private.ph
@@ -1404,9 +1404,10 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/k524_err.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/kadm5
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/kadm5/admin.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/kadm5/kadm5-private.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/kadm5/kadm5-protos.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/kadm5/kadm5_err.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/kadm5/private.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/kadm5_err.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/kafs.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/krb5-private.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/krb5-protos.ph
@@ -1414,7 +1415,6 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/krb5.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/krb5_asn1.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/krb5_err.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/private.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/keynote.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kvm.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/langinfo.ph
diff --git a/distrib/sets/lists/base/md.macppc b/distrib/sets/lists/base/md.macppc
index 009d8f66e87..eef7070c22f 100644
--- a/distrib/sets/lists/base/md.macppc
+++ b/distrib/sets/lists/base/md.macppc
@@ -35,9 +35,8 @@
 ./usr/lib/gcc-lib/powerpc-unknown-openbsd3.3/2.95.3/cpp0
 ./usr/lib/gcc-lib/powerpc-unknown-openbsd3.3/2.95.3/include
 ./usr/lib/gcc-lib/powerpc-unknown-openbsd3.3/2.95.3/specs
-./usr/lib/libasn1.so.3.1
+./usr/lib/libasn1.so.13.0
 ./usr/lib/libc.so.30.0
-./usr/lib/libcom_err.so.1.0
 ./usr/lib/libcrypto.so.10.0
 ./usr/lib/libcurses++.so.2.0
 ./usr/lib/libcurses.so.9.0
@@ -45,10 +44,10 @@
 ./usr/lib/libedit.so.1.0
 ./usr/lib/libform.so.2.0
 ./usr/lib/libg2c.so.7.0
-./usr/lib/libgssapi.so.2.0
+./usr/lib/libgssapi.so.2.1
 ./usr/lib/libiberty.so.5.0
-./usr/lib/libkafs.so.12.0
-./usr/lib/libkrb5.so.5.2
+./usr/lib/libkafs.so.13.0
+./usr/lib/libkrb5.so.13.0
 ./usr/lib/libkvm.so.7.0
 ./usr/lib/libm.so.1.0
 ./usr/lib/libmenu.so.2.0
@@ -1398,9 +1397,10 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/isofs/cd9660/iso.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/isofs/cd9660/iso_rrip.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV
-./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/admin.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/asn1-common.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/asn1_err.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/com_err.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/com_right.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/der.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/gssapi.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/hdb-private.ph
@@ -1412,9 +1412,10 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/k524_err.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/kadm5
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/kadm5/admin.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/kadm5/kadm5-private.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/kadm5/kadm5-protos.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/kadm5/kadm5_err.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/kadm5/private.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/kadm5_err.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/kafs.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/krb5-private.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/krb5-protos.ph
@@ -1422,7 +1423,6 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/krb5.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/krb5_asn1.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/krb5_err.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/private.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/keynote.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kvm.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/langinfo.ph
diff --git a/distrib/sets/lists/base/md.mvme68k b/distrib/sets/lists/base/md.mvme68k
index fee3c58254e..9ebbb4d783a 100644
--- a/distrib/sets/lists/base/md.mvme68k
+++ b/distrib/sets/lists/base/md.mvme68k
@@ -26,9 +26,8 @@
 ./usr/lib/gcc-lib/m68k-unknown-openbsd3.3/2.95.3/cpp0
 ./usr/lib/gcc-lib/m68k-unknown-openbsd3.3/2.95.3/include
 ./usr/lib/gcc-lib/m68k-unknown-openbsd3.3/2.95.3/specs
-./usr/lib/libasn1.so.3.1
+./usr/lib/libasn1.so.13.0
 ./usr/lib/libc.so.30.0
-./usr/lib/libcom_err.so.1.0
 ./usr/lib/libcrypto.so.10.0
 ./usr/lib/libcurses++.so.2.0
 ./usr/lib/libcurses.so.9.0
@@ -36,10 +35,10 @@
 ./usr/lib/libedit.so.1.0
 ./usr/lib/libform.so.2.0
 ./usr/lib/libg2c.so.7.0
-./usr/lib/libgssapi.so.2.0
+./usr/lib/libgssapi.so.2.1
 ./usr/lib/libiberty.so.5.0
-./usr/lib/libkafs.so.12.0
-./usr/lib/libkrb5.so.5.2
+./usr/lib/libkafs.so.13.0
+./usr/lib/libkrb5.so.13.0
 ./usr/lib/libkvm.so.7.0
 ./usr/lib/libm.so.1.0
 ./usr/lib/libmenu.so.2.0
@@ -1389,9 +1388,10 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/isofs/cd9660/iso.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/isofs/cd9660/iso_rrip.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV
-./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/admin.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/asn1-common.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/asn1_err.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/com_err.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/com_right.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/der.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/gssapi.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/hdb-private.ph
@@ -1403,9 +1403,10 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/k524_err.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/kadm5
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/kadm5/admin.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/kadm5/kadm5-private.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/kadm5/kadm5-protos.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/kadm5/kadm5_err.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/kadm5/private.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/kadm5_err.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/kafs.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/krb5-private.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/krb5-protos.ph
@@ -1413,7 +1414,6 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/krb5.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/krb5_asn1.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/krb5_err.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/private.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/keynote.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kvm.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/langinfo.ph
diff --git a/distrib/sets/lists/base/md.mvme88k b/distrib/sets/lists/base/md.mvme88k
index 3b294d423b1..a9274606778 100644
--- a/distrib/sets/lists/base/md.mvme88k
+++ b/distrib/sets/lists/base/md.mvme88k
@@ -1175,9 +1175,10 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosIV/krb_err.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosIV/prot.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV
-./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/admin.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/asn1-common.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/asn1_err.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/com_err.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/com_right.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/der.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/gssapi.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/hdb-private.ph
@@ -1189,16 +1190,16 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/k524_err.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/kadm5
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/kadm5/admin.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/kadm5/kadm5-private.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/kadm5/kadm5-protos.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/kadm5/kadm5_err.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/kadm5/private.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/kadm5_err.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/krb5-private.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/krb5-protos.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/krb5-types.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/krb5.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/krb5_asn1.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/krb5_err.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/private.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/keynote.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kvm.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/langinfo.ph
diff --git a/distrib/sets/lists/base/md.mvmeppc b/distrib/sets/lists/base/md.mvmeppc
index 45974683686..2007ada967e 100644
--- a/distrib/sets/lists/base/md.mvmeppc
+++ b/distrib/sets/lists/base/md.mvmeppc
@@ -31,9 +31,8 @@
 ./usr/lib/gcc-lib/powerpc-unknown-openbsd3.3/2.95.3/cpp0
 ./usr/lib/gcc-lib/powerpc-unknown-openbsd3.3/2.95.3/include
 ./usr/lib/gcc-lib/powerpc-unknown-openbsd3.3/2.95.3/specs
-./usr/lib/libasn1.so.3.1
+./usr/lib/libasn1.so.13.0
 ./usr/lib/libc.so.30.0
-./usr/lib/libcom_err.so.1.0
 ./usr/lib/libcrypto.so.10.0
 ./usr/lib/libcurses++.so.2.0
 ./usr/lib/libcurses.so.9.0
@@ -41,10 +40,10 @@
 ./usr/lib/libedit.so.1.0
 ./usr/lib/libform.so.2.0
 ./usr/lib/libg2c.so.7.0
-./usr/lib/libgssapi.so.2.0
+./usr/lib/libgssapi.so.2.1
 ./usr/lib/libiberty.so.5.0
-./usr/lib/libkafs.so.12.0
-./usr/lib/libkrb5.so.5.2
+./usr/lib/libkafs.so.13.0
+./usr/lib/libkrb5.so.13.0
 ./usr/lib/libkvm.so.7.0
 ./usr/lib/libm.so.1.0
 ./usr/lib/libmenu.so.2.0
@@ -571,6 +570,9 @@
 ./usr/libdata/perl5/powerpc-openbsd/5.8.0/threads
 ./usr/libdata/perl5/powerpc-openbsd/5.8.0/threads.pm
 ./usr/libdata/perl5/powerpc-openbsd/5.8.0/threads/shared.pm
+./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/com_right.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/hdb-private.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/kadm5/private.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/_h2ph_pre.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/a.out.ph
@@ -1391,12 +1393,11 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/isofs/cd9660/iso.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/isofs/cd9660/iso_rrip.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV
-./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/admin.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/asn1-common.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/asn1_err.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/com_err.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/der.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/gssapi.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/hdb-private.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/hdb-protos.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/hdb.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/hdb_asn1.ph
@@ -1405,9 +1406,9 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/k524_err.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/kadm5
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/kadm5/admin.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/kadm5/kadm5-private.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/kadm5/kadm5-protos.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/kadm5/kadm5_err.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/kadm5/private.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/kadm5_err.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/kafs.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/krb5-private.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/krb5-protos.ph
@@ -1415,7 +1416,6 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/krb5.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/krb5_asn1.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/krb5_err.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/private.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/keynote.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kvm.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/langinfo.ph
diff --git a/distrib/sets/lists/base/md.sparc b/distrib/sets/lists/base/md.sparc
index 2441d78387a..a6df7b3b8b3 100644
--- a/distrib/sets/lists/base/md.sparc
+++ b/distrib/sets/lists/base/md.sparc
@@ -29,9 +29,8 @@
 ./usr/lib/gcc-lib/sparc-unknown-openbsd3.3/2.95.3/cpp0
 ./usr/lib/gcc-lib/sparc-unknown-openbsd3.3/2.95.3/include
 ./usr/lib/gcc-lib/sparc-unknown-openbsd3.3/2.95.3/specs
-./usr/lib/libasn1.so.3.1
+./usr/lib/libasn1.so.13.0
 ./usr/lib/libc.so.30.0
-./usr/lib/libcom_err.so.1.0
 ./usr/lib/libcrypto.so.10.0
 ./usr/lib/libcurses++.so.2.0
 ./usr/lib/libcurses.so.9.0
@@ -39,10 +38,10 @@
 ./usr/lib/libedit.so.1.0
 ./usr/lib/libform.so.2.0
 ./usr/lib/libg2c.so.7.0
-./usr/lib/libgssapi.so.2.0
+./usr/lib/libgssapi.so.2.1
 ./usr/lib/libiberty.so.5.0
-./usr/lib/libkafs.so.12.0
-./usr/lib/libkrb5.so.5.2
+./usr/lib/libkafs.so.13.0
+./usr/lib/libkrb5.so.13.0
 ./usr/lib/libkvm.so.7.0
 ./usr/lib/libm.so.1.0
 ./usr/lib/libmenu.so.2.0
@@ -889,9 +888,10 @@
 ./usr/libdata/perl5/site_perl/sparc-openbsd/isofs/cd9660/iso.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/isofs/cd9660/iso_rrip.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/kerberosV
-./usr/libdata/perl5/site_perl/sparc-openbsd/kerberosV/admin.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/kerberosV/asn1-common.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/kerberosV/asn1_err.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/kerberosV/com_err.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/kerberosV/com_right.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/kerberosV/der.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/kerberosV/gssapi.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/kerberosV/hdb-private.ph
@@ -903,9 +903,10 @@
 ./usr/libdata/perl5/site_perl/sparc-openbsd/kerberosV/k524_err.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/kerberosV/kadm5
 ./usr/libdata/perl5/site_perl/sparc-openbsd/kerberosV/kadm5/admin.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/kerberosV/kadm5/kadm5-private.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/kerberosV/kadm5/kadm5-protos.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/kerberosV/kadm5/kadm5_err.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/kerberosV/kadm5/private.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/kerberosV/kadm5_err.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/kerberosV/kafs.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/kerberosV/krb5-private.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/kerberosV/krb5-protos.ph
@@ -913,7 +914,6 @@
 ./usr/libdata/perl5/site_perl/sparc-openbsd/kerberosV/krb5.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/kerberosV/krb5_asn1.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/kerberosV/krb5_err.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/kerberosV/private.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/keynote.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/kvm.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/langinfo.ph
diff --git a/distrib/sets/lists/base/md.sparc64 b/distrib/sets/lists/base/md.sparc64
index f5af582b59c..a63771d2dce 100644
--- a/distrib/sets/lists/base/md.sparc64
+++ b/distrib/sets/lists/base/md.sparc64
@@ -29,9 +29,8 @@
 ./usr/lib/gcc-lib/sparc64-unknown-openbsd3.3/2.95.3/cpp0
 ./usr/lib/gcc-lib/sparc64-unknown-openbsd3.3/2.95.3/include
 ./usr/lib/gcc-lib/sparc64-unknown-openbsd3.3/2.95.3/specs
-./usr/lib/libasn1.so.3.1
+./usr/lib/libasn1.so.13.0
 ./usr/lib/libc.so.30.0
-./usr/lib/libcom_err.so.1.0
 ./usr/lib/libcrypto.so.10.0
 ./usr/lib/libcurses++.so.2.0
 ./usr/lib/libcurses.so.9.0
@@ -39,10 +38,10 @@
 ./usr/lib/libedit.so.1.0
 ./usr/lib/libform.so.2.0
 ./usr/lib/libg2c.so.7.0
-./usr/lib/libgssapi.so.2.0
+./usr/lib/libgssapi.so.2.1
 ./usr/lib/libiberty.so.5.0
-./usr/lib/libkafs.so.12.0
-./usr/lib/libkrb5.so.5.2
+./usr/lib/libkafs.so.13.0
+./usr/lib/libkrb5.so.13.0
 ./usr/lib/libkvm.so.7.0
 ./usr/lib/libm.so.1.0
 ./usr/lib/libmenu.so.2.0
@@ -889,9 +888,10 @@
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/isofs/cd9660/iso.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/isofs/cd9660/iso_rrip.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/kerberosV
-./usr/libdata/perl5/site_perl/sparc64-openbsd/kerberosV/admin.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/kerberosV/asn1-common.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/kerberosV/asn1_err.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/kerberosV/com_err.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/kerberosV/com_right.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/kerberosV/der.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/kerberosV/gssapi.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/kerberosV/hdb-private.ph
@@ -903,9 +903,10 @@
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/kerberosV/k524_err.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/kerberosV/kadm5
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/kerberosV/kadm5/admin.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/kerberosV/kadm5/kadm5-private.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/kerberosV/kadm5/kadm5-protos.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/kerberosV/kadm5/kadm5_err.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/kerberosV/kadm5/private.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/kerberosV/kadm5_err.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/kerberosV/kafs.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/kerberosV/krb5-private.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/kerberosV/krb5-protos.ph
@@ -913,7 +914,6 @@
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/kerberosV/krb5.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/kerberosV/krb5_asn1.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/kerberosV/krb5_err.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/kerberosV/private.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/keynote.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/kvm.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/langinfo.ph
diff --git a/distrib/sets/lists/base/md.vax b/distrib/sets/lists/base/md.vax
index 4d78646d1e9..fa362563888 100644
--- a/distrib/sets/lists/base/md.vax
+++ b/distrib/sets/lists/base/md.vax
@@ -830,9 +830,10 @@
 ./usr/libdata/perl5/site_perl/vax-openbsd/isofs/cd9660/iso.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/isofs/cd9660/iso_rrip.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/kerberosV
-./usr/libdata/perl5/site_perl/vax-openbsd/kerberosV/admin.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/kerberosV/asn1-common.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/kerberosV/asn1_err.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/kerberosV/com_err.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/kerberosV/com_right.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/kerberosV/der.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/kerberosV/gssapi.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/kerberosV/hdb-private.ph
@@ -844,9 +845,10 @@
 ./usr/libdata/perl5/site_perl/vax-openbsd/kerberosV/k524_err.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/kerberosV/kadm5
 ./usr/libdata/perl5/site_perl/vax-openbsd/kerberosV/kadm5/admin.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/kerberosV/kadm5/kadm5-private.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/kerberosV/kadm5/kadm5-protos.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/kerberosV/kadm5/kadm5_err.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/kerberosV/kadm5/private.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/kerberosV/kadm5_err.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/kerberosV/kafs.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/kerberosV/krb5-private.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/kerberosV/krb5-protos.ph
@@ -854,7 +856,6 @@
 ./usr/libdata/perl5/site_perl/vax-openbsd/kerberosV/krb5.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/kerberosV/krb5_asn1.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/kerberosV/krb5_err.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/kerberosV/private.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/keynote.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/kvm.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/langinfo.ph
diff --git a/distrib/sets/lists/base/mi b/distrib/sets/lists/base/mi
index 3855cd7463c..f11acb4f4dc 100644
--- a/distrib/sets/lists/base/mi
+++ b/distrib/sets/lists/base/mi
@@ -213,7 +213,6 @@
 ./usr/bin/encrypt
 ./usr/bin/env
 ./usr/bin/eqn
-./usr/bin/error
 ./usr/bin/ex
 ./usr/bin/expand
 ./usr/bin/false
@@ -1565,6 +1564,7 @@
 ./usr/sbin/inetd
 ./usr/sbin/iostat
 ./usr/sbin/kadmin
+./usr/sbin/kstash
 ./usr/sbin/ktutil
 ./usr/sbin/kvm_mkdb
 ./usr/sbin/logresolve
diff --git a/distrib/sets/lists/comp/md.alpha b/distrib/sets/lists/comp/md.alpha
index 80fc8238c5e..693411a4c9b 100644
--- a/distrib/sets/lists/comp/md.alpha
+++ b/distrib/sets/lists/comp/md.alpha
@@ -118,7 +118,6 @@
 ./usr/lib/libasn1_pic.a
 ./usr/lib/libbfd.a
 ./usr/lib/libc_pic.a
-./usr/lib/libcom_err_pic.a
 ./usr/lib/libcrypto_pic.a
 ./usr/lib/libcurses++_pic.a
 ./usr/lib/libcurses_pic.a
diff --git a/distrib/sets/lists/comp/md.hp300 b/distrib/sets/lists/comp/md.hp300
index dc017a6601b..7072993b9be 100644
--- a/distrib/sets/lists/comp/md.hp300
+++ b/distrib/sets/lists/comp/md.hp300
@@ -100,7 +100,6 @@
 ./usr/lib/libasn1_pic.a
 ./usr/lib/libbfd.a
 ./usr/lib/libc_pic.a
-./usr/lib/libcom_err_pic.a
 ./usr/lib/libcrypto_pic.a
 ./usr/lib/libcurses++_pic.a
 ./usr/lib/libcurses_pic.a
diff --git a/distrib/sets/lists/comp/md.i386 b/distrib/sets/lists/comp/md.i386
index 28f31369767..89b209edee3 100644
--- a/distrib/sets/lists/comp/md.i386
+++ b/distrib/sets/lists/comp/md.i386
@@ -91,7 +91,6 @@
 ./usr/lib/libasn1_pic.a
 ./usr/lib/libbfd.a
 ./usr/lib/libc_pic.a
-./usr/lib/libcom_err_pic.a
 ./usr/lib/libcrypto_pic.a
 ./usr/lib/libcurses++_pic.a
 ./usr/lib/libcurses_pic.a
diff --git a/distrib/sets/lists/comp/md.mac68k b/distrib/sets/lists/comp/md.mac68k
index 7d93da0263b..807d783682d 100644
--- a/distrib/sets/lists/comp/md.mac68k
+++ b/distrib/sets/lists/comp/md.mac68k
@@ -108,7 +108,6 @@
 ./usr/lib/libasn1_pic.a
 ./usr/lib/libbfd.a
 ./usr/lib/libc_pic.a
-./usr/lib/libcom_err_pic.a
 ./usr/lib/libcrypto_pic.a
 ./usr/lib/libcurses++_pic.a
 ./usr/lib/libcurses_pic.a
diff --git a/distrib/sets/lists/comp/md.macppc b/distrib/sets/lists/comp/md.macppc
index f356fb292eb..f8ec4551fa4 100644
--- a/distrib/sets/lists/comp/md.macppc
+++ b/distrib/sets/lists/comp/md.macppc
@@ -125,7 +125,6 @@
 ./usr/lib/libasn1_pic.a
 ./usr/lib/libbfd.a
 ./usr/lib/libc_pic.a
-./usr/lib/libcom_err_pic.a
 ./usr/lib/libcrypto_pic.a
 ./usr/lib/libcurses++_pic.a
 ./usr/lib/libcurses_pic.a
diff --git a/distrib/sets/lists/comp/md.mvme68k b/distrib/sets/lists/comp/md.mvme68k
index 73c2c81ab51..0c711110c95 100644
--- a/distrib/sets/lists/comp/md.mvme68k
+++ b/distrib/sets/lists/comp/md.mvme68k
@@ -104,7 +104,6 @@
 ./usr/lib/libasn1_pic.a
 ./usr/lib/libbfd.a
 ./usr/lib/libc_pic.a
-./usr/lib/libcom_err_pic.a
 ./usr/lib/libcrypto_pic.a
 ./usr/lib/libcurses++_pic.a
 ./usr/lib/libcurses_pic.a
diff --git a/distrib/sets/lists/comp/md.mvmeppc b/distrib/sets/lists/comp/md.mvmeppc
index 5fbaa9529d9..ef2d10e0d22 100644
--- a/distrib/sets/lists/comp/md.mvmeppc
+++ b/distrib/sets/lists/comp/md.mvmeppc
@@ -80,7 +80,6 @@
 ./usr/lib/gcc-lib/powerpc-unknown-openbsd3.3/2.95.3/soft-float/libgcc.a
 ./usr/lib/libbfd.a
 ./usr/lib/libc_pic.a
-./usr/lib/libcom_err_pic.a
 ./usr/lib/libcrypto_pic.a
 ./usr/lib/libcurses++_pic.a
 ./usr/lib/libcurses_pic.a
@@ -90,7 +89,6 @@
 ./usr/lib/libfrtbegin_pic.a
 ./usr/lib/libg2c_pic.a
 ./usr/lib/libiberty_pic.a
-./usr/lib/libkafs_pic.a
 ./usr/lib/libkvm_pic.a
 ./usr/lib/libm_pic.a
 ./usr/lib/libmenu_pic.a
diff --git a/distrib/sets/lists/comp/md.sparc b/distrib/sets/lists/comp/md.sparc
index b993b552fef..eca97803df4 100644
--- a/distrib/sets/lists/comp/md.sparc
+++ b/distrib/sets/lists/comp/md.sparc
@@ -89,7 +89,6 @@
 ./usr/lib/libasn1_pic.a
 ./usr/lib/libbfd.a
 ./usr/lib/libc_pic.a
-./usr/lib/libcom_err_pic.a
 ./usr/lib/libcrypto_pic.a
 ./usr/lib/libcurses++_pic.a
 ./usr/lib/libcurses_pic.a
diff --git a/distrib/sets/lists/comp/md.sparc64 b/distrib/sets/lists/comp/md.sparc64
index 9677cef6b75..3811cf1e700 100644
--- a/distrib/sets/lists/comp/md.sparc64
+++ b/distrib/sets/lists/comp/md.sparc64
@@ -87,7 +87,6 @@
 ./usr/lib/libasn1_pic.a
 ./usr/lib/libbfd.a
 ./usr/lib/libc_pic.a
-./usr/lib/libcom_err_pic.a
 ./usr/lib/libcrypto_pic.a
 ./usr/lib/libcurses++_pic.a
 ./usr/lib/libcurses_pic.a
diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index 686ce108f0b..47e9e2555f2 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -901,9 +901,10 @@
 ./usr/include/isofs/cd9660/iso.h
 ./usr/include/isofs/cd9660/iso_rrip.h
 ./usr/include/kerberosV
-./usr/include/kerberosV/admin.h
 ./usr/include/kerberosV/asn1-common.h
 ./usr/include/kerberosV/asn1_err.h
+./usr/include/kerberosV/com_err.h
+./usr/include/kerberosV/com_right.h
 ./usr/include/kerberosV/der.h
 ./usr/include/kerberosV/gssapi.h
 ./usr/include/kerberosV/hdb-private.h
@@ -915,9 +916,10 @@
 ./usr/include/kerberosV/k524_err.h
 ./usr/include/kerberosV/kadm5
 ./usr/include/kerberosV/kadm5/admin.h
+./usr/include/kerberosV/kadm5/kadm5-private.h
+./usr/include/kerberosV/kadm5/kadm5-protos.h
 ./usr/include/kerberosV/kadm5/kadm5_err.h
 ./usr/include/kerberosV/kadm5/private.h
-./usr/include/kerberosV/kadm5_err.h
 ./usr/include/kerberosV/kafs.h
 ./usr/include/kerberosV/krb5-private.h
 ./usr/include/kerberosV/krb5-protos.h
@@ -925,7 +927,6 @@
 ./usr/include/kerberosV/krb5.h
 ./usr/include/kerberosV/krb5_asn1.h
 ./usr/include/kerberosV/krb5_err.h
-./usr/include/kerberosV/private.h
 ./usr/include/keynote.h
 ./usr/include/kvm.h
 ./usr/include/langinfo.h
@@ -1656,6 +1657,7 @@
 ./usr/lib/libgssapi.a
 ./usr/lib/libgssapi_p.a
 ./usr/lib/libhdb.a
+./usr/lib/libhdb_p.a
 ./usr/lib/libiberty.a
 ./usr/lib/libiberty_p.a
 ./usr/lib/libkadm5clnt.a
@@ -2920,7 +2922,6 @@
 ./usr/share/man/cat3/clrtoeol.0
 ./usr/share/man/cat3/color_content.0
 ./usr/share/man/cat3/color_set.0
-./usr/share/man/cat3/com_err.0
 ./usr/share/man/cat3/confstr.0
 ./usr/share/man/cat3/copysign.0
 ./usr/share/man/cat3/copysignf.0
diff --git a/distrib/sets/lists/man/mi b/distrib/sets/lists/man/mi
index ad105903c6e..406d7fe0cdb 100644
--- a/distrib/sets/lists/man/mi
+++ b/distrib/sets/lists/man/mi
@@ -209,7 +209,6 @@
 ./usr/share/man/cat1/encrypt.0
 ./usr/share/man/cat1/env.0
 ./usr/share/man/cat1/eqn.0
-./usr/share/man/cat1/error.0
 ./usr/share/man/cat1/ex.0
 ./usr/share/man/cat1/expand.0
 ./usr/share/man/cat1/expr.0