--- sys/conf/NOTES	Thu Sep 29 08:46:29 2005
+++ sys/conf/NOTES	Thu Oct  6 10:57:14 2005
@@ -735,6 +735,9 @@
 options 	IPSTEALTH		#support for stealth forwarding
 options 	TCPDEBUG
 
+# IP firewall control interface.
+device  	ipfwctl
+
 # The MBUF_STRESS_TEST option enables options which create
 # various random failures / extreme cases related to mbuf
 # functions.  See mbuf(9) for a list of available test cases.
@@ -764,6 +767,9 @@
 # smoother scheduling of the traffic.
 #
 options 	DUMMYNET
+
+# DUMMYNET control interface.
+device  	dnctl
 
 # BRIDGE enables bridging between ethernet cards -- see bridge(4).
 # You can use IPFIREWALL and DUMMYNET together with bridging.
--- sys/conf/files	Thu Sep 29 08:46:29 2005
+++ sys/conf/files	Fri Oct  7 14:03:44 2005
@@ -1582,12 +1582,14 @@
 netinet/in_rmx.c		optional inet
 netinet/ip_divert.c		optional ipdivert
 netinet/ip_dummynet.c		optional dummynet
+netinet/ip_dummynet.c		optional dnctl
 netinet/ip_ecn.c		optional inet
 netinet/ip_ecn.c		optional inet6
 netinet/ip_encap.c		optional inet
 netinet/ip_encap.c		optional inet6
 netinet/ip_fastfwd.c		optional inet
 netinet/ip_fw2.c		optional ipfirewall
+netinet/ip_fw2.c		optional ipfwctl
 netinet/ip_fw_pfil.c		optional ipfirewall
 netinet/ip_icmp.c		optional inet
 netinet/ip_input.c		optional inet
--- sys/conf/options	Thu Sep 29 08:46:30 2005
+++ sys/conf/options	Thu Oct  6 10:53:20 2005
@@ -345,10 +345,12 @@
 FAST_IPSEC		opt_ipsec.h
 IPDIVERT
 DUMMYNET		opt_ipdn.h
+DEV_DNCTL		opt_ipdn.h
 IPFILTER		opt_ipfilter.h
 IPFILTER_LOG		opt_ipfilter.h
 IPFILTER_LOOKUP		opt_ipfilter.h
 IPFILTER_DEFAULT_BLOCK	opt_ipfilter.h
+DEV_IPFWCTL		opt_ipfw.h
 IPFIREWALL		opt_ipfw.h
 IPFIREWALL_VERBOSE	opt_ipfw.h
 IPFIREWALL_VERBOSE_LIMIT	opt_ipfw.h