diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 7a68c2e224c4..f2c28428777a 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -2,7 +2,7 @@
 # LINT -- config file for checking all the sources, tries to pull in
 #	as much of the source tree as it can.
 #
-#	$Id: LINT,v 1.440 1998/06/30 03:01:30 jmg Exp $
+#	$Id: LINT,v 1.441 1998/06/30 07:36:33 jmg Exp $
 #
 # NB: You probably don't want to try running a kernel built from this
 # file.  Instead, you should start from GENERIC, and add options from
@@ -45,6 +45,11 @@ options		"DFLDSIZ=(256*1024*1024)"
 # and choose functionality over speed (on the widest variety of systems).
 options		FAILSAFE
 
+# Options for the VM subsystem
+#options	PQ_NOOPT		# No coloring
+options		PQ_LARGECACHE		# color for 512k/16k cache
+#options	PQ_HUGECACHE		# color for 1024k/16k cache
+
 # This allows you to actually store this configuration file into
 # the kernel binary itself, where it may be later read by saying:
 #    strings /kernel | grep ^___ | sed -e 's/^___//' > MYKERNEL
diff --git a/sys/conf/options b/sys/conf/options
index b93a4bdf3a35..796f3f3be7ad 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -1,4 +1,4 @@
-#	$Id: options,v 1.80 1998/06/30 07:36:33 jmg Exp $
+#	$Id: options,v 1.81 1998/06/30 07:47:42 jmg Exp $
 #
 #        On the handling of kernel options   
 # 
@@ -230,6 +230,12 @@ ENABLE_VFS_IOOPT	opt_global.h
 VM_KMEM_SIZE	opt_vm.h
 VM_KMEM_SIZE_SCALE opt_vm.h
 VM_KMEM_SIZE_MAX	opt_vm.h
+PQ_NOOPT	opt_vmpage.h
+PQ_NORMALCACHE	opt_vmpage.h
+PQ_MEDIUMCACHE	opt_vmpage.h
+PQ_LARGECACHE	opt_vmpage.h
+PQ_HUGECACHE	opt_vmpage.h
+
 
 # sys/netkey
 KEY
diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT
index 7a68c2e224c4..f2c28428777a 100644
--- a/sys/i386/conf/LINT
+++ b/sys/i386/conf/LINT
@@ -2,7 +2,7 @@
 # LINT -- config file for checking all the sources, tries to pull in
 #	as much of the source tree as it can.
 #
-#	$Id: LINT,v 1.440 1998/06/30 03:01:30 jmg Exp $
+#	$Id: LINT,v 1.441 1998/06/30 07:36:33 jmg Exp $
 #
 # NB: You probably don't want to try running a kernel built from this
 # file.  Instead, you should start from GENERIC, and add options from
@@ -45,6 +45,11 @@ options		"DFLDSIZ=(256*1024*1024)"
 # and choose functionality over speed (on the widest variety of systems).
 options		FAILSAFE
 
+# Options for the VM subsystem
+#options	PQ_NOOPT		# No coloring
+options		PQ_LARGECACHE		# color for 512k/16k cache
+#options	PQ_HUGECACHE		# color for 1024k/16k cache
+
 # This allows you to actually store this configuration file into
 # the kernel binary itself, where it may be later read by saying:
 #    strings /kernel | grep ^___ | sed -e 's/^___//' > MYKERNEL
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 7a68c2e224c4..f2c28428777a 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -2,7 +2,7 @@
 # LINT -- config file for checking all the sources, tries to pull in
 #	as much of the source tree as it can.
 #
-#	$Id: LINT,v 1.440 1998/06/30 03:01:30 jmg Exp $
+#	$Id: LINT,v 1.441 1998/06/30 07:36:33 jmg Exp $
 #
 # NB: You probably don't want to try running a kernel built from this
 # file.  Instead, you should start from GENERIC, and add options from
@@ -45,6 +45,11 @@ options		"DFLDSIZ=(256*1024*1024)"
 # and choose functionality over speed (on the widest variety of systems).
 options		FAILSAFE
 
+# Options for the VM subsystem
+#options	PQ_NOOPT		# No coloring
+options		PQ_LARGECACHE		# color for 512k/16k cache
+#options	PQ_HUGECACHE		# color for 1024k/16k cache
+
 # This allows you to actually store this configuration file into
 # the kernel binary itself, where it may be later read by saying:
 #    strings /kernel | grep ^___ | sed -e 's/^___//' > MYKERNEL
diff --git a/sys/vm/vm_page.h b/sys/vm/vm_page.h
index 6c86de2b9613..d0aafb5bcd4b 100644
--- a/sys/vm/vm_page.h
+++ b/sys/vm/vm_page.h
@@ -61,7 +61,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_page.h,v 1.40 1998/06/07 17:13:14 dfr Exp $
+ * $Id: vm_page.h,v 1.41 1998/06/21 18:02:50 bde Exp $
  */
 
 /*
@@ -71,6 +71,8 @@
 #ifndef	_VM_PAGE_
 #define	_VM_PAGE_
 
+#include "opt_vmpage.h"
+
 #include <vm/pmap.h>
 /*
  *	Management of resident (logical) pages.