diff --git a/distrib/sets/lists/base/obsolete.i386 b/distrib/sets/lists/base/obsolete.i386
index 43e9e70b6547..1d1bec078c23 100644
--- a/distrib/sets/lists/base/obsolete.i386
+++ b/distrib/sets/lists/base/obsolete.i386
@@ -1,4 +1,4 @@
-# $NetBSD: obsolete.i386,v 1.7 2000/10/22 22:59:29 fvdl Exp $
+# $NetBSD: obsolete.i386,v 1.8 2000/10/27 13:02:19 fvdl Exp $
 /dev/ttyv1
 /dev/ttyv2
 /dev/ttyv3
@@ -9,8 +9,6 @@
 /dev/vga
 /usr/bin/fontedit
 /usr/bin/vttest
-/usr/include/i386
-/usr/include/machine
 /usr/include/machine/ansi.h
 /usr/include/machine/aout_machdep.h
 /usr/include/machine/apmvar.h
@@ -67,14 +65,75 @@
 /usr/include/machine/varargs.h
 /usr/include/machine/vm86.h
 /usr/include/machine/vmparam.h
+/usr/include/machine
+/usr/include/i386/_G_config.h
+/usr/include/i386/ansi.h
+/usr/include/i386/aout_machdep.h
+/usr/include/i386/apmvar.h
+/usr/include/i386/asm.h
+/usr/include/i386/bioscall.h
+/usr/include/i386/bootinfo.h
+/usr/include/i386/bswap.h
+/usr/include/i386/bus.h
+/usr/include/i386/byte_swap.h
+/usr/include/i386/cdefs.h
+/usr/include/i386/conf.h
+/usr/include/i386/cpu.h
+/usr/include/i386/cpufunc.h
+/usr/include/i386/cputypes.h
+/usr/include/i386/db_machdep.h
+/usr/include/i386/disklabel.h
+/usr/include/i386/elf_machdep.h
+/usr/include/i386/endian.h
+/usr/include/i386/float.h
+/usr/include/i386/frame.h
+/usr/include/i386/freebsd_machdep.h
+/usr/include/i386/gdt.h
+/usr/include/i386/ibcs2_machdep.h
+/usr/include/i386/ieee.h
+/usr/include/i386/ieeefp.h
+/usr/include/i386/intr.h
+/usr/include/i386/joystick.h
+/usr/include/i386/kcore.h
+/usr/include/i386/limits.h
+/usr/include/i386/mouse.h
+/usr/include/i386/npx.h
+/usr/include/i386/param.h
+/usr/include/i386/pcb.h
+/usr/include/i386/pccons.h
+/usr/include/i386/pcvt_ioctl.h
+/usr/include/i386/pio.h
+/usr/include/i386/pmap.h
+/usr/include/i386/pmap.new.h
+/usr/include/i386/proc.h
+/usr/include/i386/profile.h
+/usr/include/i386/psl.h
+/usr/include/i386/pte.h
+/usr/include/i386/ptrace.h
+/usr/include/i386/reg.h
+/usr/include/i386/segments.h
+/usr/include/i386/setjmp.h
+/usr/include/i386/signal.h
+/usr/include/i386/specialreg.h
+/usr/include/i386/spkr.h
+/usr/include/i386/stdarg.h
+/usr/include/i386/svr4_machdep.h
+/usr/include/i386/sysarch.h
+/usr/include/i386/trap.h
+/usr/include/i386/tss.h
+/usr/include/i386/types.h
+/usr/include/i386/varargs.h
+/usr/include/i386/vm86.h
+/usr/include/i386/vmparam.h
+/usr/include/i386
 /usr/mdec/bootfd
 /usr/mdec/bootsd
 /usr/mdec/bootwd
 /usr/mdec/fdboot
 /usr/mdec/sdboot
 /usr/mdec/wdboot
-/usr/share/pcvt
 /usr/share/pcvt/fonts
+/usr/share/pcvt
 /usr/share/pcvt/fonts/vt220h.808
 /usr/share/pcvt/fonts/vt220h.810
 /usr/share/pcvt/fonts/vt220h.814