diff --git a/src/Config b/src/Config
index 9ac46c2e..db502079 100644
--- a/src/Config
+++ b/src/Config
@@ -1,6 +1,21 @@
+##############################################################################
+##############################################################################
+#
+# IMPORTANT!
+# 
+# This file is deprecated.  All options are gradually being migrated
+# to config.h.  Only options that affect the entire build
+# (e.g. overriding the $(CC) Makefile variable) should be placed in
+# here.
+#
+##############################################################################
+##############################################################################
+
+
 #
 # Config for Etherboot/32
 #
+#
 # Do not delete the tag OptionDescription and /OptionDescription
 # It is used to automatically generate the documentation.
 #
diff --git a/src/arch/i386/Config b/src/arch/i386/Config
index a2126527..da3ab492 100644
--- a/src/arch/i386/Config
+++ b/src/arch/i386/Config
@@ -1,3 +1,20 @@
+##############################################################################
+##############################################################################
+#
+# IMPORTANT!
+# 
+# The use of this file to set options that affect only single object
+# files is deprecated, because changing anything in this file results
+# in a complete rebuild, which is slow.  All options are gradually
+# being migrated to config.h, which does not suffer from this problem.
+# 
+# Only options that affect the entire build (e.g. overriding the $(CC)
+# Makefile variable) should be placed in here.
+#
+##############################################################################
+##############################################################################
+
+
 # Config for i386 Etherboot
 #
 # Do not delete the tag OptionDescription and /OptionDescription
@@ -99,10 +116,6 @@ CFLAGS+=	-DPCBIOS
 # LCONFIG+=	-DBBS_BUT_NOT_PNP_COMPLIANT
 # LCONFIG+=	-DBOOT_INT18H
 
-# Produce code that will work inside the Bochs emulator.  The pnic
-# driver is probably the best one to try.
-# CFLAGS+=	-DCONFIG_PCI_DIRECT
-
 # Produce code that will work with OpenBSD's pxeboot
 # CFLAGS+=	-DFLATTEN_REAL_MODE