diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 1b064c2aabd2..2ca1fcc0c9fd 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.444 1998/06/30 08:24:00 jmg Exp $
+#	$Id: LINT,v 1.445 1998/06/30 14:43:01 bde 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
@@ -431,6 +431,7 @@ options		MROUTING		# Multicast routing
 options         IPFIREWALL              #firewall
 options         IPFIREWALL_VERBOSE      #print information about
 					# dropped packets
+options         IPFIREWALL_FORWARD      #enable xparent proxy support
 options		"IPFIREWALL_VERBOSE_LIMIT=100" #limit verbosity
 options		IPFIREWALL_DEFAULT_TO_ACCEPT #allow everything by default
 options		IPDIVERT		#divert sockets
@@ -438,7 +439,6 @@ options		IPFILTER		#kernel ipfilter support
 options		IPFILTER_LOG		#ipfilter logging
 #options	IPFILTER_LKM		#kernel support for ip_fil.o LKM
 options		TCPDEBUG
-#options	IPFW_DIVERT_OLDRESTART	# old (broken) divert/restart semantics
 
 
 #####################################################################
diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT
index 1b064c2aabd2..2ca1fcc0c9fd 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.444 1998/06/30 08:24:00 jmg Exp $
+#	$Id: LINT,v 1.445 1998/06/30 14:43:01 bde 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
@@ -431,6 +431,7 @@ options		MROUTING		# Multicast routing
 options         IPFIREWALL              #firewall
 options         IPFIREWALL_VERBOSE      #print information about
 					# dropped packets
+options         IPFIREWALL_FORWARD      #enable xparent proxy support
 options		"IPFIREWALL_VERBOSE_LIMIT=100" #limit verbosity
 options		IPFIREWALL_DEFAULT_TO_ACCEPT #allow everything by default
 options		IPDIVERT		#divert sockets
@@ -438,7 +439,6 @@ options		IPFILTER		#kernel ipfilter support
 options		IPFILTER_LOG		#ipfilter logging
 #options	IPFILTER_LKM		#kernel support for ip_fil.o LKM
 options		TCPDEBUG
-#options	IPFW_DIVERT_OLDRESTART	# old (broken) divert/restart semantics
 
 
 #####################################################################
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 1b064c2aabd2..2ca1fcc0c9fd 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.444 1998/06/30 08:24:00 jmg Exp $
+#	$Id: LINT,v 1.445 1998/06/30 14:43:01 bde 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
@@ -431,6 +431,7 @@ options		MROUTING		# Multicast routing
 options         IPFIREWALL              #firewall
 options         IPFIREWALL_VERBOSE      #print information about
 					# dropped packets
+options         IPFIREWALL_FORWARD      #enable xparent proxy support
 options		"IPFIREWALL_VERBOSE_LIMIT=100" #limit verbosity
 options		IPFIREWALL_DEFAULT_TO_ACCEPT #allow everything by default
 options		IPDIVERT		#divert sockets
@@ -438,7 +439,6 @@ options		IPFILTER		#kernel ipfilter support
 options		IPFILTER_LOG		#ipfilter logging
 #options	IPFILTER_LKM		#kernel support for ip_fil.o LKM
 options		TCPDEBUG
-#options	IPFW_DIVERT_OLDRESTART	# old (broken) divert/restart semantics
 
 
 #####################################################################