diff --git a/sys/conf/options.pc98 b/sys/conf/options.pc98
index ebc8110102e..4f271dc9fc1 100644
--- a/sys/conf/options.pc98
+++ b/sys/conf/options.pc98
@@ -1,4 +1,4 @@
-#	$Id: options.pc98,v 1.74 1998/12/14 08:52:20 kato Exp $
+#	$Id: options.pc98,v 1.75 1998/12/21 09:58:37 kato Exp $
 
 DISABLE_PSE
 IDE_DELAY
@@ -26,7 +26,6 @@ BREAK_TO_DEBUGGER	opt_comconsole.h
 CONSPEED		opt_comconsole.h
 COM_ESP			opt_sio.h
 COM_MULTIPORT		opt_sio.h
-DSI_SOFT_MODEM		opt_sio.h
 EXTRA_SIO		opt_sio.h
 I586_PMC_GUPROF		opt_i586_guprof.h
 WLCACHE			opt_wavelan.h
@@ -57,6 +56,7 @@ CPU_UPGRADE_HW_CACHE		opt_cpu.h
 CPU_WT_ALLOC			opt_cpu.h
 CYRIX_CACHE_WORKS		opt_cpu.h
 CYRIX_CACHE_REALLY_WORKS	opt_cpu.h
+NO_MEMORY_HOLE			opt_cpu.h
 
 # The CPU type affects the endian conversion functions all over the kernel.
 I386_CPU		opt_global.h
@@ -101,28 +101,44 @@ FDC_DEBUG			opt_fdc.h
 FDC_PRINT_BOGUS_CHIPTYPE	opt_fdc.h
 FDC_YE				opt_fdc.h
 
-# pcvt(4) has a bunch of options
-FAT_CURSOR		opt_pcvt.h
-XSERVER			opt_pcvt.h
-PCVT_24LINESDEF		opt_pcvt.h
-PCVT_CTRL_ALT_DEL	opt_pcvt.h
-PCVT_EMU_MOUSE		opt_pcvt.h
-PCVT_FREEBSD		opt_pcvt.h
-PCVT_META_ESC		opt_pcvt.h
-PCVT_NSCREENS		opt_pcvt.h
-PCVT_PRETTYSCRNS	opt_pcvt.h
-PCVT_SCANSET		opt_pcvt.h
-PCVT_SCREENSAVER	opt_pcvt.h
-PCVT_USEKBDSEC		opt_pcvt.h
-PCVT_VT220KEYB		opt_pcvt.h
-
-# voxware options
-GUS_DMA2		opt_sound.h
-GUS_DMA			opt_sound.h
-GUS_IRQ			opt_sound.h
-
 # Video spigot
 SPIGOT_UNSECURE		opt_spigot.h
+# -------------------------------
+# isdn4bsd: passive ISA cards
+# -------------------------------
+TEL_S0_8		opt_i4b.h
+TEL_S0_16		opt_i4b.h
+TEL_S0_16_3		opt_i4b.h
+AVM_A1			opt_i4b.h
+USR_STI			opt_i4b.h
+ITKIX1			opt_i4b.h
+# -------------------------------
+# isdn4bsd: passive ISA PnP cards
+# -------------------------------
+CRTX_S0_P		opt_i4b.h
+DRN_NGO                 opt_i4b.h
+TEL_S0_16_3_P		opt_i4b.h
+SEDLBAUER		opt_i4b.h
+DYNALINK		opt_i4b.h
+ELSA_QS1ISA		opt_i4b.h
+# -------------------------------
+# isdn4bsd: passive PCI cards
+# -------------------------------
+ELSA_QS1PCI		opt_i4b.h
+# -------------------------------
+# isdn4bsd: passive PCMCIA cards
+# -------------------------------
+AVM_A1_PCMCIA		opt_i4b.h
+# -------------------------------
+# isdn4bsd: misc options
+# -------------------------------
+# temporary workaround for SMP machines
+I4B_SMP_WORKAROUND      opt_i4b.h
+# enable VJ compression code for ipr i/f
+IPR_VJ			opt_i4b.h
+# -------------------------------
+# EOF
+# -------------------------------
 
 # bs driver options
 SCSI_BOUNCE_SIZE	opt_bs.h
diff --git a/sys/pc98/conf/options.pc98 b/sys/pc98/conf/options.pc98
index ebc8110102e..4f271dc9fc1 100644
--- a/sys/pc98/conf/options.pc98
+++ b/sys/pc98/conf/options.pc98
@@ -1,4 +1,4 @@
-#	$Id: options.pc98,v 1.74 1998/12/14 08:52:20 kato Exp $
+#	$Id: options.pc98,v 1.75 1998/12/21 09:58:37 kato Exp $
 
 DISABLE_PSE
 IDE_DELAY
@@ -26,7 +26,6 @@ BREAK_TO_DEBUGGER	opt_comconsole.h
 CONSPEED		opt_comconsole.h
 COM_ESP			opt_sio.h
 COM_MULTIPORT		opt_sio.h
-DSI_SOFT_MODEM		opt_sio.h
 EXTRA_SIO		opt_sio.h
 I586_PMC_GUPROF		opt_i586_guprof.h
 WLCACHE			opt_wavelan.h
@@ -57,6 +56,7 @@ CPU_UPGRADE_HW_CACHE		opt_cpu.h
 CPU_WT_ALLOC			opt_cpu.h
 CYRIX_CACHE_WORKS		opt_cpu.h
 CYRIX_CACHE_REALLY_WORKS	opt_cpu.h
+NO_MEMORY_HOLE			opt_cpu.h
 
 # The CPU type affects the endian conversion functions all over the kernel.
 I386_CPU		opt_global.h
@@ -101,28 +101,44 @@ FDC_DEBUG			opt_fdc.h
 FDC_PRINT_BOGUS_CHIPTYPE	opt_fdc.h
 FDC_YE				opt_fdc.h
 
-# pcvt(4) has a bunch of options
-FAT_CURSOR		opt_pcvt.h
-XSERVER			opt_pcvt.h
-PCVT_24LINESDEF		opt_pcvt.h
-PCVT_CTRL_ALT_DEL	opt_pcvt.h
-PCVT_EMU_MOUSE		opt_pcvt.h
-PCVT_FREEBSD		opt_pcvt.h
-PCVT_META_ESC		opt_pcvt.h
-PCVT_NSCREENS		opt_pcvt.h
-PCVT_PRETTYSCRNS	opt_pcvt.h
-PCVT_SCANSET		opt_pcvt.h
-PCVT_SCREENSAVER	opt_pcvt.h
-PCVT_USEKBDSEC		opt_pcvt.h
-PCVT_VT220KEYB		opt_pcvt.h
-
-# voxware options
-GUS_DMA2		opt_sound.h
-GUS_DMA			opt_sound.h
-GUS_IRQ			opt_sound.h
-
 # Video spigot
 SPIGOT_UNSECURE		opt_spigot.h
+# -------------------------------
+# isdn4bsd: passive ISA cards
+# -------------------------------
+TEL_S0_8		opt_i4b.h
+TEL_S0_16		opt_i4b.h
+TEL_S0_16_3		opt_i4b.h
+AVM_A1			opt_i4b.h
+USR_STI			opt_i4b.h
+ITKIX1			opt_i4b.h
+# -------------------------------
+# isdn4bsd: passive ISA PnP cards
+# -------------------------------
+CRTX_S0_P		opt_i4b.h
+DRN_NGO                 opt_i4b.h
+TEL_S0_16_3_P		opt_i4b.h
+SEDLBAUER		opt_i4b.h
+DYNALINK		opt_i4b.h
+ELSA_QS1ISA		opt_i4b.h
+# -------------------------------
+# isdn4bsd: passive PCI cards
+# -------------------------------
+ELSA_QS1PCI		opt_i4b.h
+# -------------------------------
+# isdn4bsd: passive PCMCIA cards
+# -------------------------------
+AVM_A1_PCMCIA		opt_i4b.h
+# -------------------------------
+# isdn4bsd: misc options
+# -------------------------------
+# temporary workaround for SMP machines
+I4B_SMP_WORKAROUND      opt_i4b.h
+# enable VJ compression code for ipr i/f
+IPR_VJ			opt_i4b.h
+# -------------------------------
+# EOF
+# -------------------------------
 
 # bs driver options
 SCSI_BOUNCE_SIZE	opt_bs.h