diff --git a/sys/conf/Makefile.i386 b/sys/conf/Makefile.i386
index d1cacbcf1b9..2718b5cea83 100644
--- a/sys/conf/Makefile.i386
+++ b/sys/conf/Makefile.i386
@@ -1,7 +1,7 @@
 # Makefile.i386 -- with config changes.
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
-#	$Id: Makefile.i386,v 1.93 1997/02/22 09:31:39 peter Exp $
+#	$Id: Makefile.i386,v 1.94 1997/04/22 06:55:21 jdp Exp $
 #
 # Makefile for FreeBSD
 #
@@ -34,7 +34,7 @@ INCLUDES+= -I$S/../include
 .else
 INCLUDES+= -I/usr/include
 .endif
-COPTS=	${INCLUDES} ${IDENT} -DKERNEL
+COPTS=	${INCLUDES} ${IDENT} -DKERNEL -include opt_global.h
 CFLAGS=	${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS}
 LOAD_ADDRESS?=	F0100000
 .if defined(PROF)
@@ -137,12 +137,14 @@ assym.s: genassym
 
 # Some of the defines that genassym outputs may well depend on the
 # value of kernel options.
-genassym.o: ${I386}/i386/genassym.c Makefile
+genassym.o: ${I386}/i386/genassym.c Makefile opt_global.h
 	${CC} -c ${CFLAGS} ${PARAM} -UKERNEL ${I386}/i386/genassym.c
 
 genassym: genassym.o
 	${CC} ${CFLAGS} ${PARAM} genassym.o -o $@
 
+${OBJS}: opt_global.h
+
 # XXX this assumes that the options for NORMAL_C* and DRIVER_C* are identical.
 depend: assym.s param.c vnode_if.h ${BEFORE_DEPEND}
 	rm -f .newdep
diff --git a/sys/conf/Makefile.powerpc b/sys/conf/Makefile.powerpc
index d1cacbcf1b9..2718b5cea83 100644
--- a/sys/conf/Makefile.powerpc
+++ b/sys/conf/Makefile.powerpc
@@ -1,7 +1,7 @@
 # Makefile.i386 -- with config changes.
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
-#	$Id: Makefile.i386,v 1.93 1997/02/22 09:31:39 peter Exp $
+#	$Id: Makefile.i386,v 1.94 1997/04/22 06:55:21 jdp Exp $
 #
 # Makefile for FreeBSD
 #
@@ -34,7 +34,7 @@ INCLUDES+= -I$S/../include
 .else
 INCLUDES+= -I/usr/include
 .endif
-COPTS=	${INCLUDES} ${IDENT} -DKERNEL
+COPTS=	${INCLUDES} ${IDENT} -DKERNEL -include opt_global.h
 CFLAGS=	${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS}
 LOAD_ADDRESS?=	F0100000
 .if defined(PROF)
@@ -137,12 +137,14 @@ assym.s: genassym
 
 # Some of the defines that genassym outputs may well depend on the
 # value of kernel options.
-genassym.o: ${I386}/i386/genassym.c Makefile
+genassym.o: ${I386}/i386/genassym.c Makefile opt_global.h
 	${CC} -c ${CFLAGS} ${PARAM} -UKERNEL ${I386}/i386/genassym.c
 
 genassym: genassym.o
 	${CC} ${CFLAGS} ${PARAM} genassym.o -o $@
 
+${OBJS}: opt_global.h
+
 # XXX this assumes that the options for NORMAL_C* and DRIVER_C* are identical.
 depend: assym.s param.c vnode_if.h ${BEFORE_DEPEND}
 	rm -f .newdep
diff --git a/sys/conf/options.i386 b/sys/conf/options.i386
index 57ba3edb0ac..29d3f9e60be 100644
--- a/sys/conf/options.i386
+++ b/sys/conf/options.i386
@@ -1,4 +1,6 @@
-#	$Id: options.i386,v 1.39 1997/04/05 13:21:08 bde Exp $
+#	$Id: options.i386,v 1.40 1997/04/26 11:44:59 peter Exp $
+XXXCreateMe		opt_global.h
+
 BOUNCEPAGES		opt_bounce.h
 USER_LDT
 MATH_EMULATE		opt_math_emulate.h
diff --git a/sys/i386/conf/Makefile.i386 b/sys/i386/conf/Makefile.i386
index d1cacbcf1b9..2718b5cea83 100644
--- a/sys/i386/conf/Makefile.i386
+++ b/sys/i386/conf/Makefile.i386
@@ -1,7 +1,7 @@
 # Makefile.i386 -- with config changes.
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
-#	$Id: Makefile.i386,v 1.93 1997/02/22 09:31:39 peter Exp $
+#	$Id: Makefile.i386,v 1.94 1997/04/22 06:55:21 jdp Exp $
 #
 # Makefile for FreeBSD
 #
@@ -34,7 +34,7 @@ INCLUDES+= -I$S/../include
 .else
 INCLUDES+= -I/usr/include
 .endif
-COPTS=	${INCLUDES} ${IDENT} -DKERNEL
+COPTS=	${INCLUDES} ${IDENT} -DKERNEL -include opt_global.h
 CFLAGS=	${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS}
 LOAD_ADDRESS?=	F0100000
 .if defined(PROF)
@@ -137,12 +137,14 @@ assym.s: genassym
 
 # Some of the defines that genassym outputs may well depend on the
 # value of kernel options.
-genassym.o: ${I386}/i386/genassym.c Makefile
+genassym.o: ${I386}/i386/genassym.c Makefile opt_global.h
 	${CC} -c ${CFLAGS} ${PARAM} -UKERNEL ${I386}/i386/genassym.c
 
 genassym: genassym.o
 	${CC} ${CFLAGS} ${PARAM} genassym.o -o $@
 
+${OBJS}: opt_global.h
+
 # XXX this assumes that the options for NORMAL_C* and DRIVER_C* are identical.
 depend: assym.s param.c vnode_if.h ${BEFORE_DEPEND}
 	rm -f .newdep
diff --git a/sys/i386/conf/options.i386 b/sys/i386/conf/options.i386
index 57ba3edb0ac..29d3f9e60be 100644
--- a/sys/i386/conf/options.i386
+++ b/sys/i386/conf/options.i386
@@ -1,4 +1,6 @@
-#	$Id: options.i386,v 1.39 1997/04/05 13:21:08 bde Exp $
+#	$Id: options.i386,v 1.40 1997/04/26 11:44:59 peter Exp $
+XXXCreateMe		opt_global.h
+
 BOUNCEPAGES		opt_bounce.h
 USER_LDT
 MATH_EMULATE		opt_math_emulate.h