diff --git a/sys/conf/options.amd64 b/sys/conf/options.amd64
index ccbe0f66d99..fd0dc6d966a 100644
--- a/sys/conf/options.amd64
+++ b/sys/conf/options.amd64
@@ -5,12 +5,25 @@ AUTO_EOI_1		opt_auto_eoi.h
 AUTO_EOI_2		opt_auto_eoi.h
 MAXMEM
 PERFMON			opt_perfmon.h
+PMAP_SHPGPERPROC	opt_pmap.h
+
+# Options for emulators.  These should only be used at config time, so
+# they are handled like options for static filesystems
+# (see src/sys/conf/options), except for broken debugging options.
+IBCS2			opt_dontuse.h
+COMPAT_LINUX		opt_dontuse.h
+COMPAT_SVR4		opt_dontuse.h
+DEBUG_SVR4		opt_svr4.h
+NDISAPI			opt_dontuse.h
+PECOFF_DEBUG		opt_pecoff.h
+PECOFF_SUPPORT		opt_dontuse.h
 
 # Change KVM size.  Changes things all over the kernel.
 KVA_PAGES		opt_global.h
 
-CLK_CALIBRATION_LOOP	opt_clock.h
-TIMER_FREQ		opt_clock.h
+CLK_CALIBRATION_LOOP		opt_clock.h
+CLK_USE_I8254_CALIBRATION	opt_clock.h
+TIMER_FREQ			opt_clock.h
 
 VGA_ALT_SEQACCESS	opt_vga.h
 VGA_DEBUG		opt_vga.h
@@ -19,8 +32,24 @@ VGA_NO_MODE_CHANGE	opt_vga.h
 VGA_SLOW_IOACCESS	opt_vga.h
 VGA_WIDTH90		opt_vga.h
 
+VESA
+VESA_DEBUG		opt_vesa.h
+
 ATKBD_DFLT_KEYMAP	opt_atkbd.h
 
+# -------------------------------
+# isdn4bsd: passive PCI cards
+# -------------------------------
+ELSA_QS1PCI		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
+IPR_LOG			opt_i4b.h
+
 # -------------------------------
 # EOF
 # -------------------------------