diff --git a/src/Config b/src/Config
index 81cfb462..c92efa73 100644
--- a/src/Config
+++ b/src/Config
@@ -193,18 +193,6 @@
 #	-DDOWNLOAD_PROTO_HTTP
 #			If defined, includes HTTP support.
 #
-#	Console options:
-#
-#	-DCONSOLE_FIRMWARE
-#			Set for firmware/BIOS provided (default if nothing else is set).
-#			Normally this is shows up on your CRT.
-#	-DCONSOLE_SERIAL
-#			Set for serial console.
-#	-DCONSOLE_DUAL
-#			Both of the above
-#	-DCONSOLE_DIRECT_VGA
-#			Set for direct VGA console (only for x86).
-#
 #	Interface export options:
 #
 #	-DPXE_EXPORT
@@ -246,24 +234,12 @@
 #			running the one you think you are.  Requires
 #			-DBUILD_SERIAL.
 #
-#	BUS options:
-#	
-#	-DCONFIG_PCI
-#			Include support for devices using the pci bus.
-#	-DCONFIG_ISA
-#			Include support for devices using isa bus.
-#	-DCONFIG_PCMCIA
-#			Include support for PCMCIA in general *development*
 # @/OptionDescription@
 
 # These default settings compile Etherboot with a small number of options.
 # You may wish to enable more of the features if the size of your ROM allows.
 
 
-# Select which buses etherboot should support
-CFLAGS+=	-DCONFIG_PCI -DCONFIG_ISA
-# CFLAGS+=	-DCONFIG_PCMCIA
-
 # For prompting and default on timeout
 CFLAGS+=	-DASK_BOOT=3 -DBOOT_FIRST=BOOT_NIC
 # If you would like to attempt to boot from other devices as well as the network.
diff --git a/src/config.h b/src/config.h
index a5732484..50a49457 100644
--- a/src/config.h
+++ b/src/config.h
@@ -8,6 +8,23 @@
  *
  */
 
+/* @BEGIN general.h
+ *
+ * Console configuration
+ *
+ * These options specify the console types that Etherboot will use for
+ * interaction with the user.
+ *
+ */
+
+#define CONSOLE_FIRMWARE	1	/* Default BIOS console */
+#define CONSOLE_SERIAL		0	/* Serial port */
+#define CONSOLE_DIRECT_VGA	0	/* Direct access to VGA card */
+#define CONSOLE_BTEXT		0	/* Who knows what this does? */
+#define CONSOLE_PC_KBD		0	/* Direct access to PC keyboard */
+
+/* @END general.h */
+
 /* @BEGIN serial.h
  *
  * Serial port configuration